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

* commit 'f86c0757747f32fcabb6260d997c9e066399f528':