[automerger skipped] Merge "Use inclusive language in build/make part 2" into...

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

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

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

Change-Id: I60bd628b336f28c1cfb1cfc06d3d215d280ce544