Merge "AmrwbDecoderTest: Added AndroidTest.xml to run test with atest" am: d6a03aa433 am: 4be5f2ef3c

Change-Id: Id754a3f2270ea1de53098ed6eed6b2f0ad707cb7