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

Change-Id: I0178a376e31c9b3f3d898c18f33c91bf828a347b