Merge tag 'android-6.0.0_r26' into HEAD

Android 6.0.0 release 26

* tag 'android-6.0.0_r26':
  Fix crash on invalid channel config

Change-Id: Icabe2f599516baf4411edbc57437693fa4afaae1