Merge "Merge in some android customizations. Minor cleanup. am: dcb310be am: fb0ab1f5 am: f686a8c4" into oc-mr1-dev-plus-aosp