[automerger skipped] Merge "Use inclusive language in build/make" into rvc-dev am: 7244e60105
-s ours
am skip reason: Change-Id I54a7e55d3fdd5571ef1ae33ebe443c10d138fd28 with SHA-1 c3ad80467e
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11857304
Change-Id: Id849de50f5e5e367e1ed0fc40b785cb1fcdf44dc
This commit is contained in: