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

Change-Id: Ibd051b3eb4c820a9ead9bc7a0090e8a72de3e443