Merge tag 'android-5.1.1_r1' of https://android.googlesource.com/platform/build into cm-12.1

Android 5.1.1 release 1