am 94012bc3: am ffe509ff: am d0af1ded: (-s ours) am a421314f: am 430475da:...

am 94012bc3: am ffe509ff: am d0af1ded: (-s ours) am a421314f: am 430475da: resolved conflicts for merge of 0b3eca88 to jb-mr1-dev-plus-aosp

* commit '94012bc3':
  Prevent integer overflow when processing covr MPEG4 atoms