am a421314f: am 430475da: resolved conflicts for merge of 0b3eca88 to jb-mr1-dev-plus-aosp

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