[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 -s ours am: b7ef01ba -s ours

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

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

Change-Id: If93d8dc996856c5742770d150ea38680f955f0a8