Merge tag 'android-7.1.1_r9' into HEAD

Android 7.1.1 release 9