Revert "Revert "refs/tags/android-5.0.0_r7""

This reverts commit 49bd467eca6984812821aa1a6c0bb698a6f6cbc3.