Merge "Efficiency improvements in OggExtractor"