Merge tag 'android-6.0.0_r26' into HEAD

Android 6.0.0 release 26

* tag 'android-6.0.0_r26':

Change-Id: Icce9a553e4841eef30210233133edb1dc95b711d