Merge tag 'android-7.1.1_r4' into aosp-7.1.1

Android 7.1.1 release 4