Merge tag 'android-6.0.1_r3' into 601r3

Android 6.0.1 release 3

* tag 'android-6.0.1_r3':

Change-Id: I85ab5b2f16a1d81b02b3690b104992e73bea0404