Merge "ExtractorUnitTest: Added AndroidTest.xml to run test with atest" am: f44b0fd7b7

Change-Id: Ia20c31f637337ce63ef9cee4f58eb6daa77ba7a7