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

Change-Id: I760a46d34a4360f2f72c8d70fd096ad4ea8c966e