Merge in some android customizations. Minor cleanup. am: dcb310be2a am: bb6b51fdff am: 8b61dbc442 am: 3f26426dbb
am: 0e67758246

Change-Id: Ie90a9b2bafcdf02985ece5d53256c8a35e096855