Perf: Removing S5s from waterfall

tools/perf/generate_perf_json.py

Index: tools/perf/generate_perf_json.py
diff --git a/tools/perf/generate_perf_json.py b/tools/perf/generate_perf_json.py
index 60a841b3f0bb0b14bb230673d3152c5d208126f4..41aae82af5460b26a3291dfb00d25d2202f0c5be 100755
--- a/tools/perf/generate_perf_json.py
+++ b/tools/perf/generate_perf_json.py
@@ -32,10 +32,6 @@ SCRIPT_TESTS = [
     'testers': {
       'chromium.perf': [
         {
-          'name': 'Android Galaxy S5 Perf',
-          'shards': [3]
-        },
-        {
           'name': 'Android Nexus5 Perf',
           'shards': [2]
         },
@@ -49,12 +45,6 @@ SCRIPT_TESTS = [
         #  'shards': [2]
         #}
       ],
-      'chromium.perf.fyi': [
-        {
-          'name': 'Android Galaxy S5 Perf',
-          'shards': [1]
-        },
-      ]
     }
   },
   {
@@ -68,10 +58,6 @@ SCRIPT_TESTS = [
     'testers': {
       'chromium.perf': [
         {
-          'name': 'Android Galaxy S5 Perf',
-          'shards': [3]
-        },
-        {
           'name': 'Android Nexus5 Perf',
           'shards': [2]
         },
@@ -88,12 +74,6 @@ SCRIPT_TESTS = [
           'shards': [2]
         },
       ],
-      'chromium.perf.fyi': [
-        {
-          'name': 'Android Galaxy S5 Perf',
-          'shards': [1]
-        },
-      ]
     }
   },
   {
@@ -139,10 +119,6 @@ SCRIPT_TESTS = [
     'testers': {
       'chromium.perf': [
         {
-          'name': 'Android Galaxy S5 Perf',
-          'shards': [3]
-        },
-        {
           'name': 'Android Nexus5 Perf',
           'shards': [2]
         },
@@ -286,9 +262,6 @@ def add_tester(waterfall, name, perf_id, platform, target_bits=64,
 def get_fyi_waterfall_config():
   waterfall = {'builders':[], 'testers': {}}
   waterfall = add_tester(
-    waterfall, 'Android Galaxy S5 Perf',
-    'android-galaxy-s5-perf', 'android')
-  waterfall = add_tester(
     waterfall, 'Win 10 Low-End Perf Tests',
     'win-10-low-end', 'win',
     swarming=[
@@ -332,10 +305,6 @@ def get_waterfall_config():
   # build/scripts/slave/recipe_modules/chromium_tests and must be kept in sync
   # to generate the correct json for each tester
   waterfall = add_tester(
-    waterfall, 'Android Galaxy S5 Perf',
-    'android-galaxy-s5', 'android', target_bits=32,
-    num_device_shards=7, num_host_shards=3)
-  waterfall = add_tester(
     waterfall, 'Android Nexus5 Perf', 'android-nexus5',
     'android', target_bits=32, num_device_shards=7, num_host_shards=3)
   waterfall = add_tester(