Use more inclusive terms. am: 697ce36c44

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

Change-Id: Ice1685616e48b8fcdcb46c320b208707045be1ed