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

Change-Id: Ibd9e2f8d332a39f15c73fe59ae14ffea30925495