Merge tag 'android-6.0.0_r26' into HEAD

Android 6.0.0 release 26

* tag 'android-6.0.0_r26':

Change-Id: Ibbf34e62d18397f6b00d82a58efcc69419865cca