Merge "Mp3DecoderTest: Added AndroidTest.xml to run test with atest"