Merge in some android customizations. Minor cleanup. am: a42162715c am: c4978c1ccc
am: 085d0fbcb4

Change-Id: I2edcaf754a346ba3f2e6e7d66a9a764bf6af22c9