Snap for 9014491 from 60f3f6ee430ab9ecf5a2a9d251097f80279924cf to tm-qpr1-release

Change-Id: I614cfd2accd96cea5ade3428ceb2a0d4e2f8de36
diff --git a/tests/Android.bp b/tests/Android.bp
index 9ad3d3b..0708e85 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -216,6 +216,7 @@
     ],
 
     test_suites: ["general-tests"],
+    test_config: "RecoveryHostTest.xml",
 
     data: ["testdata/*"],
 
diff --git a/tests/AndroidTest.xml b/tests/RecoveryHostTest.xml
similarity index 100%
rename from tests/AndroidTest.xml
rename to tests/RecoveryHostTest.xml