Clean up AndroidTest.xml so that tests can merge easier

Bug: 113680154
Test: None

Change-Id: I6109f56ccb81484ef633625b8a884ae85f34a22b
1 file changed