Merge tag 'android-7.1.0_r4' into aosp-7.1

Android 7.1.0 release 4