Merge "Fix end-of-stream handling in OggExtractor"