Cleanup for #inclusivefixit.

Test: build
Change-Id: If11a32c130367560394eccf442de95d941918073
7 files changed