Merge "Fix Ogg extractor and Vorbis decoder"