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

Change-Id: I90bf85bdd53d1d5827b54d9666a42b44d004bd12