Use more inclusive terms

Updating language to comply with the inclusive language guidance

Bug: 162326641
Test: m -j
Change-Id: I627c22c3a0f89879255f1c65cfa314aebc70417e
7 files changed