Merge tag 'android-6.0.0_r5' into cm-13.0

Android 6.0.0 release 5