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

Change-Id: Iadf1b943ebad87caf79ffbb6a54fb95e713b856d