Merge tag 'android-6.0.1_r3' into 601r3

Android 6.0.1 release 3

* tag 'android-6.0.1_r3':

Change-Id: Idb629d21120db114520403d755a6141535c21759