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

Change-Id: I17bc3689c5407c499e71d645142a2c7fdbaa2826