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