Revert back to AOSP android-5.0.0_r7