am 14c686c0: am 940189d9: am 475de998: am 47759307: am 17b625b7: Merge "Fix integer overflow during MP4 atom processing" into klp-dev

* commit '14c686c0f6eb3e9ac5774bbfa7b5f2fa4e04ce80':
  Fix integer overflow during MP4 atom processing