Merge tag 'android-6.0.0_r26' into HEAD

Android 6.0.0 release 26

* tag 'android-6.0.0_r26':

Change-Id: I2d88f5a5fda26cce717a64e07f0a033d7b0ed1de