Merge tag 'android-7.1.1_r25' into 7.1.1

Android 7.1.1 release 25