Add back the GalaxyS3 and GalaxyS4 entries in recipes

infra/bots/recipes/swarm_trigger.py

 # Copyright 2016 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 
 # Recipe module for Skia Swarming trigger.
 
 
 import os
 import json
@@ skipping 95 matching lines @@
   if builder_cfg.get('extra_config', '').startswith('CT_'):
     dimensions['pool'] = 'SkiaCT'
     return dimensions  # Do not need any more dimensions for CT builders.
   if 'Win' in builder_cfg.get('os', ''):
     dimensions['os'] = 'Windows'
   if builder_cfg['role'] in ('Test', 'Perf'):
     if 'Android' in builder_cfg['os']:
       # For Android, the device type is a better dimension than CPU or GPU.
       dimensions['device_type'] = {
         'AndroidOne':    'sprout',
+        'GalaxyS3':      'm0',  #'smdk4x12', Detected incorrectly by swarming?
+        'GalaxyS4':      None,  # TODO(borenet,kjlubick)
         'GalaxyS7':      'heroqlteatt',
         'NVIDIA_Shield': 'foster',
         'Nexus10':       'manta',
         'Nexus5':        'hammerhead',
         'Nexus6':        'shamu',
         'Nexus6p':       'angler',
         'Nexus7':        'grouper',
         'Nexus7v2':      'flo',
         'Nexus9':        'flounder',
         'NexusPlayer':   'fugu',
@@ skipping 689 matching lines @@
           mastername='client.skia',
           slavename='skiabot-linux-swarm-000',
           buildnumber=5,
           path_config='kitchen',
           revision='abc123',
           **gerrit_kwargs) +
       api.step_data(
           'upload new .isolated file for test_skia',
           stdout=api.raw_io.output('def456 XYZ.isolated'))
   )