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

Change-Id: Id2d1c1fbb71e359944be182037ea428f0012197d