Merge tag 'android-6.0.0_r26' into HEAD

Android 6.0.0 release 26

* tag 'android-6.0.0_r26':
  libvorbisidec: sanity check index of marker.
  Add sanity checks to fix crash
  Fix vorbis decoder crash due to out of bounds memory access

Change-Id: I2e7289c41e666c8a0da6152c2fb90375a915ebc6