Merge "Replace 'his or her' with their for #inclusivefixit" am: b5b5021a92 am: 5f94085f67 am: 44d2c27ed7

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

Change-Id: I016973167e2d75abbe5b6d900f61f92fcc2bcc96