Take two at fixing android bots still using testlistjson.

Tools/TestResultServer/model/jsonresults.py

Index: Tools/TestResultServer/model/jsonresults.py
diff --git a/Tools/TestResultServer/model/jsonresults.py b/Tools/TestResultServer/model/jsonresults.py
index 3e6d09356ee0e5ff1cb4ee2514e92bddadce1ed0..10be3fbc9665185a98d100e3f79c34d2e2e12546 100755
--- a/Tools/TestResultServer/model/jsonresults.py
+++ b/Tools/TestResultServer/model/jsonresults.py
@@ -503,3 +503,30 @@ class JsonResults(object):
         if status_code != 200:
             return new_results, status_code
         return TestFile.save_file(file, new_results)
+
+    @classmethod
+    def _delete_results_and_times(cls, tests):
+        for key in tests.keys():
+            if key in (RESULTS_KEY, TIMES_KEY):
+                del tests[key]
+            else:
+                cls._delete_results_and_times(tests[key])
+
+    @classmethod
+    def get_test_list(cls, builder, json_file_data):
+        logging.debug("Loading test results json...")
+        json = cls._load_json(json_file_data)
+        if not json:
+            return None
+
+        logging.debug("Checking test results json...")
+
+        check_json_error_string = cls._check_json(builder, json)
+        if check_json_error_string:
+            return None
+
+        test_list_json = {}
+        tests = json[builder][TESTS_KEY]
+        cls._delete_results_and_times(tests)
+        test_list_json[builder] = {TESTS_KEY: tests}
+        return cls._generate_file_data(test_list_json)