Merge "Update language to comply with Android’s inclusive language guidance" am: 0bb33ab010 am: 27b367fd26

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

Change-Id: I72370bfecf2115ed3acda3a72a97f0e955218ee2