Merge changes I1ea9dec1,I1dbffcbe

* changes:
  Fix build errors on host due to macro __unused
  Update language to comply with Android's inclusive language guidance