Merge in some android customizations. Minor cleanup. am: dcb310be am: bb6b51fd am: 8b61dbc4 am: 3f26426d am: 0e677582 Change-Id: I760a46d34a4360f2f72c8d70fd096ad4ea8c966e