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

Change-Id: I63b7b658e28e29bcd68a7daad464d7276033912d