Use more inclusive terms. am: 697ce36c44 am: 8b712f7045 am: 6848641a68

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/12505403

Change-Id: I1bd8776ce57ec6b29556c599b95ab8feb9154cb7