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