Merge "AmrnbEncoderTest: Added AndroidTest.xml to run test with atest" am: bf449a74ed am: ada4e4dea8 am: 89b6f2df77

Change-Id: Idd7a048c76fb712c1fdb2a07baf46f7cf8f1f825