Merge "Update language to comply with Android's inclusive language guidance" am: ecb3b55542

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

Change-Id: Ib05b5fcaac4b3b9ddff6263e611600da391e3b10