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

Change-Id: I0d281f8d1fb2b7db31f5e72c4e284ce42174bce8