Merge tag 'android-6.0.1_r3' into 601r3

Android 6.0.1 release 3

* tag 'android-6.0.1_r3':
  libvorbisidec: sanity check index of marker.

Change-Id: I1405b66c933e391bec8d7dd33d21e6d40638c05d