Merge tag 'android-6.0.1_r3'

Android 6.0.1 release 3