Merge in some android customizations. Minor cleanup. am: dcb310be2a am: fb0ab1f5ed
am: f686a8c4a6

Change-Id: Ifc0a6494f8b7551eacd698074f81be14d58e9148