am efabeff1: am 7d3be414: am f475f6c0: am e168bdd2: am f19acf48: am 66b91b34: am e6382cb0: am 115e995c: resolved conflicts for merge of 1f44d837 to lmp-dev

* commit 'efabeff1':
  Fix integer overflow when handling MPEG4 tx3g atom