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

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

Change-Id: I1f7549b1b2926ef115bf4119cbc8d99aa32d4d0e