Merge tag 'android-6.0.0_r26' into HEAD

Android 6.0.0 release 26

* tag 'android-6.0.0_r26':

Change-Id: Ia66bc44be7526da0c5fff61d2e1fdba4fdfd0228