Merge "Merge in some android customizations. Minor cleanup. am: dcb310be am: bb6b51fd am: 54976f10" into oc-mr1-dev-plus-aosp