Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/prebuilts/misc into HEAD

Android 6.0.1 release 22