Merge tag 'android-6.0.1_r3' of https://android.googlesource.com/platform/build into cm-13.0

Android 6.0.1 release 3

Change-Id: Ifd951be596daad53785b191ddce316a6a4a96e03