Port hw_accel_feature and screenshot_sync tests to new harness.

content/test/gpu/generate_buildbot_json.py

Index: content/test/gpu/generate_buildbot_json.py
diff --git a/content/test/gpu/generate_buildbot_json.py b/content/test/gpu/generate_buildbot_json.py
index f0af56fdba94e53ab95e74e429ae3da7197460d8..f158e024b35762e5ce3aed29f44bf6fae6a6cf3d 100755
--- a/content/test/gpu/generate_buildbot_json.py
+++ b/content/test/gpu/generate_buildbot_json.py
@@ -1115,13 +1115,6 @@ NON_SWARMED_GTESTS = {
 }
 
 TELEMETRY_TESTS = {
-  'hardware_accelerated_feature': {
-    'tester_configs': [
-      {
-        'allow_on_android': True,
-      },
-    ],
-  },
   'maps_pixel_test': {
     'target_name': 'maps',
     'args': [
@@ -1138,13 +1131,6 @@ TELEMETRY_TESTS = {
       },
     ],
   },
-  'screenshot_sync': {
-    'tester_configs': [
-      {
-        'allow_on_android': True,
-      },
-    ],
-  },
 }
 
 # These tests use Telemetry's new, simpler, browser_test_runner.
@@ -1173,6 +1159,13 @@ TELEMETRY_GPU_INTEGRATION_TESTS = {
         }
       ],
   },
+  'hardware_accelerated_feature': {
+    'tester_configs': [
+      {
+        'allow_on_android': True,
+      },
+    ],
+  },
   'pixel_test': {
     'target_name': 'pixel',
     'args': [
@@ -1197,6 +1190,13 @@ TELEMETRY_GPU_INTEGRATION_TESTS = {
       },
     ],
   },
+  'screenshot_sync': {
+    'tester_configs': [
+      {
+        'allow_on_android': True,
+      },
+    ],
+  },
   'trace_test': {
     'tester_configs': [
       {