Merge tag 'android-6.0.0_r26' into HEAD

Android 6.0.0 release 26

* tag 'android-6.0.0_r26':

Change-Id: I9a999fcb4e0e0626a664f83b5aae2e2d48262b57