am e356780d: am 1adbb8c3: Merge "Fix iTunSMPB parsing for AAC tracks encoded with Nero" into jb-mr1-dev

* commit 'e356780df8379d875d1e549eca8daa1a5e399f03':
  Fix iTunSMPB parsing for AAC tracks encoded with Nero