Take two at fixing android bots still using testlistjson.

Tools/TestResultServer/handlers/testfilehandler.py

Index: Tools/TestResultServer/handlers/testfilehandler.py
diff --git a/Tools/TestResultServer/handlers/testfilehandler.py b/Tools/TestResultServer/handlers/testfilehandler.py
index 9fe16a0d34a25af163352797f084ffd72ea8b684..6a0822de3c7afd2a33488425edd01d409a0a1eee 100644
--- a/Tools/TestResultServer/handlers/testfilehandler.py
+++ b/Tools/TestResultServer/handlers/testfilehandler.py
@@ -51,6 +51,7 @@ PARAM_BEFORE = "before"
 PARAM_NUM_FILES = "numfiles"
 PARAM_KEY = "key"
 PARAM_TEST_TYPE = "testtype"
+PARAM_TEST_LIST_JSON = "testlistjson"
 PARAM_CALLBACK = "callback"
 
 
@@ -180,6 +181,7 @@ class GetFile(webapp2.RequestHandler):
         name = self.request.get(PARAM_NAME)
         before = self.request.get(PARAM_BEFORE)
         num_files = self.request.get(PARAM_NUM_FILES)
+        test_list_json = self.request.get(PARAM_TEST_LIST_JSON)
         callback_name = self.request.get(PARAM_CALLBACK)
 
         logging.debug(
@@ -200,10 +202,14 @@ class GetFile(webapp2.RequestHandler):
             if not master_data:
                 self.error(404)
                 return
+
             json, date = self._get_file_content(master_data['url_name'], builder, test_type, build_number, name)
             if json is None:
                 json, date = self._get_file_content(master_data['name'], builder, test_type, build_number, name)
 
+            if test_list_json:
+                json = JsonResults.get_test_list(builder, json)
+
         if json:
             json = _replace_jsonp_callback(json, callback_name)