Merge tag 'android-6.0.0_r26' into HEAD

Android 6.0.0 release 26

* tag 'android-6.0.0_r26':

Change-Id: Ia3b080b5d740fbc4588e10d7f73c2ae90b56ca7f