Merge remote-tracking branch 'upstream/marshmallow-release', tag 'android-6.0.0_r1' into HEAD

Android 6.0.0 release 1

Change-Id: Iccee3137d91fb86555abe4596e356cc6c2a2ce47