Merge "Remove AndroidTest.xml files to use the default config"