Merge "Fix crash in Opus and Vorbis decoders" into oc-dev
am: 4ff7a41e72

Change-Id: Ic185b2b4638243daab1fe0d2845a208adc22cded