Merge in some android customizations. Minor cleanup. am: dcb310be2a am: fb0ab1f5ed
am: 9ea8dba285

Change-Id: I57b23f5093b9697942e574d305d46a91ee8f44fa