Merge tag 'android-7.1.1_r4' into cm-14.1

Android 7.1.1 release 4

Change-Id: I14b36666b5a478024f3a9ffab90fd675a6157461