Merge tag 'android-5.0.0_r7'

Android 5.0.0 release 7