[automerger skipped] Merge "Use inclusive language in build/make" into rvc-dev...

[automerger skipped] Merge "Use inclusive language in build/make" into rvc-dev am: 7244e601 am: f24ee30b am: be74a37f -s ours am: 6465a0a8 -s ours

am skip reason: Change-Id I54a7e55d3fdd5571ef1ae33ebe443c10d138fd28 with SHA-1 c3ad8046 is in history

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

Change-Id: I03c9e4bb69180d8a75c243b7550fcb9384588e8d