am 11f84239: am f98021ce: Merge "Add test for mp3 decoder"

* commit '11f84239b9c926aaca74c1e952f10c7aaec7f385':
  Add test for mp3 decoder