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

Change-Id: Ib69f38ce291ec4d6f9efd2005d4b045ee941a63b