Merge "Removed AndroidTest.xml for IStats VTS"