Merge "Perfprofd: Fix AndroidTest.xml"