Merge "Merge in some android customizations. Minor cleanup. am: dcb310be2a am: fb0ab1f5ed am: f686a8c4a6" into oc-mr1-dev-plus-aosp
am: 9567858635

Change-Id: Ic1971321b1185e7371345ca0cef28a8da709a400