am f1333994: (-s ours) am 11f84239: am f98021ce: Merge "Add test for mp3 decoder"

* commit 'f1333994d6ca35dc75a47808cf3a8037d012f3cc':