Fix Android change markers

This CL contains only comments tweaks and typos/mistakes fixes and
introduces zero code changes.

Bug: 120028294
Test: ensure make droid cts bulds
Change-Id: Idff55489bc2ed0a8a12a2e0a28cba3f874f951c0
31 files changed