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

Android 6.0.1 release 22

Change-Id: Icd3603c1efc5fa85f48c19d13d484f0371ddae37