Merge tag 'android-6.0.0_r26' into HEAD

Android 6.0.0 release 26

* tag 'android-6.0.0_r26':

Change-Id: I875267435f2a00018b4cfa503ff7d24c53b59840