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

Change-Id: I941e688dabaf12f768ac57d10207dfb051db13f0