Merge "AmrwbEncoderTest: Added AndroidTest.xml to run test with atest" am: 2c03bb8741 am: c33c8a7a46

Change-Id: Ieb12455ea3643a80a05ce60959e786618d47d796