Merge tag 'android-6.0.0_r26' into HEAD

Android 6.0.0 release 26

* tag 'android-6.0.0_r26':
  Update api-generator prebuilt

Change-Id: I7ae32d863d6826da95d938a6f7a2920bde0b52e8