Merge in some android customizations. Minor cleanup.
am: a42162715c

Change-Id: Ic062dfdbf372fb924bbc655aab6034278f410d7a