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

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

Change-Id: Icf0cbcbec2857ff48aba3fda9077e2af935801b2