Revert of Remove Blimp from waterfall configurations and buildbot recipes.

testing/buildbot/chromium.android.json

 {
   "Android Cronet Builder": {
     "additional_compile_targets": [
       "cronet_package"
     ]
   },
   "Android N5X Swarm Builder": {
     "gtest_tests": [
       {
         "override_compile_targets": [
@@ skipping 86 matching lines @@
                 "=android%2Fswarming%2Flogcats%2F",
                 "${TASK_ID}%2F%2B%2Funified_logcats"
               ],
               "name": "shard #${SHARD_INDEX} logcats"
             }
           ]
         },
         "test": "base_unittests"
       },
       {
+        "override_compile_targets": [
+          "blimp_test_apk"
+        ],
+        "override_isolate_target": "blimp_test_apk",
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "cipd_packages": [
+            {
+              "cipd_package": "infra/tools/luci/logdog/butler/${platform}",
+              "location": "bin",
+              "revision": "git_revision:25755a2c316937ee44a6432163dc5e2f9c85cf58"
+            }
+          ],
+          "dimension_sets": [
+            {
+              "android_devices": "4",
+              "device_os": "MMB29Q",
+              "device_type": "bullhead"
+            }
+          ],
+          "hard_timeout": 960,
+          "output_links": [
+            {
+              "link": [
+                "https://luci-logdog.appspot.com/v/?s",
+                "=android%2Fswarming%2Flogcats%2F",
+                "${TASK_ID}%2F%2B%2Funified_logcats"
+              ],
+              "name": "shard #${SHARD_INDEX} logcats"
+            }
+          ]
+        },
+        "test": "blimp_test_apk"
+      },
+      {
+        "override_isolate_target": "blimp_unittests",
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "cipd_packages": [
+            {
+              "cipd_package": "infra/tools/luci/logdog/butler/${platform}",
+              "location": "bin",
+              "revision": "git_revision:25755a2c316937ee44a6432163dc5e2f9c85cf58"
+            }
+          ],
+          "dimension_sets": [
+            {
+              "android_devices": "4",
+              "device_os": "MMB29Q",
+              "device_type": "bullhead"
+            }
+          ],
+          "output_links": [
+            {
+              "link": [
+                "https://luci-logdog.appspot.com/v/?s",
+                "=android%2Fswarming%2Flogcats%2F",
+                "${TASK_ID}%2F%2B%2Funified_logcats"
+              ],
+              "name": "shard #${SHARD_INDEX} logcats"
+            }
+          ]
+        },
+        "test": "blimp_unittests"
+      },
+      {
         "override_isolate_target": "blink_heap_unittests",
         "swarming": {
           "can_use_on_swarming_builders": true,
           "cipd_packages": [
             {
               "cipd_package": "infra/tools/luci/logdog/butler/${platform}",
               "location": "bin",
               "revision": "git_revision:25755a2c316937ee44a6432163dc5e2f9c85cf58"
             }
           ],
@@ skipping 1026 matching lines @@
   },
   "KitKat Tablet Tester": {
     "gtest_tests": [
       {
         "test": "android_webview_unittests"
       },
       {
         "test": "base_unittests"
       },
       {
+        "test": "blimp_unittests"
+      },
+      {
         "override_compile_targets": [
           "breakpad_unittests_deps"
         ],
         "test": "breakpad_unittests"
       },
       {
         "test": "capture_unittests"
       },
       {
         "test": "cc_unittests"
@@ skipping 66 matching lines @@
       },
       {
         "test": "vr_shell_unittests"
       }
     ],
     "instrumentation_tests": [
       {
         "test": "android_webview_test_apk"
       },
       {
+        "apk_under_test": "Blimp.apk",
+        "override_compile_targets": [
+          "blimp_test_apk"
+        ],
+        "test": "blimp_test_apk",
+        "test_apk": "BlimpTest.apk"
+      },
+      {
         "test": "chrome_public_test_apk"
       },
       {
         "test": "chrome_sync_shell_test_apk"
       },
       {
         "test": "content_shell_test_apk"
       }
     ]
   },
@@ skipping 59 matching lines @@
                 "=android%2Fswarming%2Flogcats%2F",
                 "${TASK_ID}%2F%2B%2Funified_logcats"
               ],
               "name": "shard #${SHARD_INDEX} logcats"
             }
           ]
         },
         "test": "base_unittests"
       },
       {
+        "override_isolate_target": "blimp_unittests",
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "cipd_packages": [
+            {
+              "cipd_package": "infra/tools/luci/logdog/butler/${platform}",
+              "location": "bin",
+              "revision": "git_revision:25755a2c316937ee44a6432163dc5e2f9c85cf58"
+            }
+          ],
+          "dimension_sets": [
+            {
+              "android_devices": "4",
+              "device_os": "LMY48I",
+              "device_type": "hammerhead"
+            }
+          ],
+          "expiration": 10800,
+          "hard_timeout": 960,
+          "output_links": [
+            {
+              "link": [
+                "https://luci-logdog.appspot.com/v/?s",
+                "=android%2Fswarming%2Flogcats%2F",
+                "${TASK_ID}%2F%2B%2Funified_logcats"
+              ],
+              "name": "shard #${SHARD_INDEX} logcats"
+            }
+          ]
+        },
+        "test": "blimp_unittests"
+      },
+      {
         "override_compile_targets": [
           "breakpad_unittests_deps"
         ],
         "override_isolate_target": "breakpad_unittests",
         "swarming": {
           "can_use_on_swarming_builders": true,
           "cipd_packages": [
             {
               "cipd_package": "infra/tools/luci/logdog/butler/${platform}",
               "location": "bin",
@@ skipping 848 matching lines @@
                 "${TASK_ID}%2F%2B%2Funified_logcats"
               ],
               "name": "shard #${SHARD_INDEX} logcats"
             }
           ]
         },
         "test": "android_webview_test_apk"
       },
       {
         "override_compile_targets": [
+          "blimp_test_apk"
+        ],
+        "override_isolate_target": "blimp_test_apk",
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "cipd_packages": [
+            {
+              "cipd_package": "infra/tools/luci/logdog/butler/${platform}",
+              "location": "bin",
+              "revision": "git_revision:25755a2c316937ee44a6432163dc5e2f9c85cf58"
+            }
+          ],
+          "dimension_sets": [
+            {
+              "android_devices": "4",
+              "device_os": "LMY48I",
+              "device_type": "hammerhead"
+            }
+          ],
+          "expiration": 10800,
+          "hard_timeout": 960,
+          "output_links": [
+            {
+              "link": [
+                "https://luci-logdog.appspot.com/v/?s",
+                "=android%2Fswarming%2Flogcats%2F",
+                "${TASK_ID}%2F%2B%2Funified_logcats"
+              ],
+              "name": "shard #${SHARD_INDEX} logcats"
+            }
+          ]
+        },
+        "test": "blimp_test_apk"
+      },
+      {
+        "override_compile_targets": [
           "chrome_public_test_apk"
         ],
         "override_isolate_target": "chrome_public_test_apk",
         "swarming": {
           "can_use_on_swarming_builders": true,
           "cipd_packages": [
             {
               "cipd_package": "infra/tools/luci/logdog/butler/${platform}",
               "location": "bin",
               "revision": "git_revision:25755a2c316937ee44a6432163dc5e2f9c85cf58"
@@ skipping 97 matching lines @@
   },
   "Lollipop Tablet Tester": {
     "gtest_tests": [
       {
         "test": "android_webview_unittests"
       },
       {
         "test": "base_unittests"
       },
       {
+        "test": "blimp_unittests"
+      },
+      {
         "override_compile_targets": [
           "breakpad_unittests_deps"
         ],
         "test": "breakpad_unittests"
       },
       {
         "test": "capture_unittests"
       },
       {
         "test": "cc_unittests"
@@ skipping 66 matching lines @@
       },
       {
         "test": "vr_shell_unittests"
       }
     ],
     "instrumentation_tests": [
       {
         "test": "android_webview_test_apk"
       },
       {
+        "apk_under_test": "Blimp.apk",
+        "override_compile_targets": [
+          "blimp_test_apk"
+        ],
+        "test": "blimp_test_apk",
+        "test_apk": "BlimpTest.apk"
+      },
+      {
         "test": "chrome_public_test_apk"
       },
       {
         "test": "chrome_sync_shell_test_apk"
       },
       {
         "test": "content_shell_test_apk"
       }
     ]
   },
@@ skipping 89 matching lines @@
                 "=android%2Fswarming%2Flogcats%2F",
                 "${TASK_ID}%2F%2B%2Funified_logcats"
               ],
               "name": "shard #${SHARD_INDEX} logcats"
             }
           ]
         },
         "test": "base_unittests"
       },
       {
+        "override_compile_targets": [
+          "blimp_test_apk"
+        ],
+        "override_isolate_target": "blimp_test_apk",
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "cipd_packages": [
+            {
+              "cipd_package": "infra/tools/luci/logdog/butler/${platform}",
+              "location": "bin",
+              "revision": "git_revision:25755a2c316937ee44a6432163dc5e2f9c85cf58"
+            }
+          ],
+          "dimension_sets": [
+            {
+              "device_os": "MMB29Q",
+              "device_type": "bullhead"
+            }
+          ],
+          "hard_timeout": 600,
+          "output_links": [
+            {
+              "link": [
+                "https://luci-logdog.appspot.com/v/?s",
+                "=android%2Fswarming%2Flogcats%2F",
+                "${TASK_ID}%2F%2B%2Funified_logcats"
+              ],
+              "name": "shard #${SHARD_INDEX} logcats"
+            }
+          ]
+        },
+        "test": "blimp_test_apk"
+      },
+      {
+        "override_isolate_target": "blimp_unittests",
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "cipd_packages": [
+            {
+              "cipd_package": "infra/tools/luci/logdog/butler/${platform}",
+              "location": "bin",
+              "revision": "git_revision:25755a2c316937ee44a6432163dc5e2f9c85cf58"
+            }
+          ],
+          "dimension_sets": [
+            {
+              "device_os": "MMB29Q",
+              "device_type": "bullhead"
+            }
+          ],
+          "hard_timeout": 960,
+          "output_links": [
+            {
+              "link": [
+                "https://luci-logdog.appspot.com/v/?s",
+                "=android%2Fswarming%2Flogcats%2F",
+                "${TASK_ID}%2F%2B%2Funified_logcats"
+              ],
+              "name": "shard #${SHARD_INDEX} logcats"
+            }
+          ]
+        },
+        "test": "blimp_unittests"
+      },
+      {
         "override_isolate_target": "blink_heap_unittests",
         "swarming": {
           "can_use_on_swarming_builders": true,
           "cipd_packages": [
             {
               "cipd_package": "infra/tools/luci/logdog/butler/${platform}",
               "location": "bin",
               "revision": "git_revision:25755a2c316937ee44a6432163dc5e2f9c85cf58"
             }
           ],
@@ skipping 935 matching lines @@
   },
   "Marshmallow Tablet Tester": {
     "gtest_tests": [
       {
         "test": "android_webview_unittests"
       },
       {
         "test": "base_unittests"
       },
       {
+        "test": "blimp_unittests"
+      },
+      {
         "override_compile_targets": [
           "breakpad_unittests_deps"
         ],
         "test": "breakpad_unittests"
       },
       {
         "test": "capture_unittests"
       },
       {
         "test": "cc_unittests"
@@ skipping 66 matching lines @@
       },
       {
         "test": "vr_shell_unittests"
       }
     ],
     "instrumentation_tests": [
       {
         "test": "android_webview_test_apk"
       },
       {
+        "apk_under_test": "Blimp.apk",
+        "override_compile_targets": [
+          "blimp_test_apk"
+        ],
+        "test": "blimp_test_apk",
+        "test_apk": "BlimpTest.apk"
+      },
+      {
         "test": "chrome_public_test_apk"
       },
       {
         "test": "chrome_sync_shell_test_apk"
       },
       {
         "test": "content_shell_test_apk"
       }
     ]
   }
 }