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

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

Change-Id: Id1ada74ab86d4d0d1692dd483bfdae4710ea4cbc