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

Change-Id: Ie6627a2225acf9fdace34a7bed7cb4dde397a91d