Merge tag 'android-5.1.1_r5' into cm-12.1

Android 5.1.1 release 5