Merge tag 'android-6.0.1_r3' into 601r3

Android 6.0.1 release 3

* tag 'android-6.0.1_r3':
  Fixes unnecessary multi-merge steps.

Change-Id: I3dc4a714c4ab6a9db1ab477eadd6d2fbff1d5731