Merge tag 'android-7.1.1_r22' into 7.1.1

Android 7.1.1 Release 22 (NMF26X)