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

Change-Id: I42ef87bd05d3ed2d3b732a8b7aa32082efa757d6