Merge "Remove custom AndroidTest.xml"