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