am 3abb451f: am f86c0757: (-s ours) am fc608967: am d98db140: Merge "Fix benign unsigned overflow in OggExtractor"

* commit '3abb451f70438fc7d5ff75999fd922c243e408e9':