Add back the GalaxyS3 and GalaxyS4 entries in recipes

S3 is needed for some recipe simulation stuff and in general having
these present does not hurt us.

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2336513003

Review-Url: https://codereview.chromium.org/2336513003

infra/bots/recipe_modules/flavor/android_flavor.py

@@ -32,6 +32,8 @@ def get_device(api):
     # Test/Perf bots.
     return {
       'AndroidOne':    'arm_v7_neon',
+      'GalaxyS3':      'arm_v7_neon',
+      'GalaxyS4':      'arm_v7_neon',
       'GalaxyS7':      'arm64',
       'NVIDIA_Shield': 'arm64',
       'Nexus10':       'arm_v7_neon',

infra/bots/recipes/swarm_trigger.py

@@ -113,6 +113,8 @@ def swarm_dimensions(builder_cfg):
       # 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',