Use more inclusive terms.

Bug: b/162288333
Test: N/A
Change-Id: I0b7df559b0aa5e7b30908f634cab7190a9fb4def
31 files changed