Merge tag 'android-6.0.1_r3' into 601r3

Android 6.0.1 release 3

* tag 'android-6.0.1_r3':

Change-Id: Ieaf2a6863b0430e590175595f0b77e71a52202ff