Merge "Replace 'his or her' with their for #inclusivefixit" am: b9dd851066 am: c21bcfbd5a

Original change: https://android-review.googlesource.com/c/platform/frameworks/compile/libbcc/+/1370137

Change-Id: I311f0fb05a9e94582e2d58730a3808793f5c20b0