Revert "refs/tags/android-5.0.0_r7"

This reverts commit eb903aab7b0221eecb03b2a1dbab39d4d5169d72.