Merge "Really fix end-of-stream handling in OggExtractor"