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

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