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

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

Change-Id: Ia8097815f1afccd90ff9c804b45adb27b4210bad