Merge tag 'android-6.0.0_r26' into HEAD

Android 6.0.0 release 26

* tag 'android-6.0.0_r26':

Change-Id: I9a68fcb86cb8f63ce85ebf87a3d787e312fd54f9