Merge "Update language to comply with Android’s inclusive language guidance" am: 9083088018

Original change: https://android-review.googlesource.com/c/platform/developers/build/+/1373478

Change-Id: I6024a7994be15a8342b57dd6680f44bb9519b32d