[automerger skipped] Merge "Use inclusive language in build/make part 2" into rvc-dev am: b6d0be94 am: 5d995f06 am: b8bbb0ee -s ours

am skip reason: Change-Id I63bac680cc63a8564f35ae85dda1a0b09c9fd541 with SHA-1 d1cbfeaa is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11991738

Change-Id: I27a84119d379ecc2325c6cd9fa94b51202547b5e