Merge tag 'android-5.0.0_r6' of https://android.googlesource.com/platform/build into L

Android 5.0.0 release 6