Merge 'android-7.1.2_r29' into a7.1.2

Android 7.1.2 Release 29 (NJH47F)