am 767fea95: Merge "Apparently the mp3 decoder glitches if it was configured with the wrong" into jb-mr2-dev

* commit '767fea952b45f29f2091f1fb59a1bb3c24eed7e1':
  Apparently the mp3 decoder glitches if it was configured with the wrong