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

Change-Id: Id02247e5215130e41ccf890ca88016987719a8bf