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