Merge "Fix benign unsigned overflow in OggExtractor"