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

Change-Id: Iacf231177655f676e598f680c1f21f3804f45e2f