Revert of Remove Blimp from waterfall configurations and buildbot recipes.

testing/buildbot/chromium.android.fyi.json

Index: testing/buildbot/chromium.android.fyi.json
diff --git a/testing/buildbot/chromium.android.fyi.json b/testing/buildbot/chromium.android.fyi.json
index a2d037a028565ec57189cf8125a969d26b14ae94..569c94593719c2b78528c67139a22db075840072 100644
--- a/testing/buildbot/chromium.android.fyi.json
+++ b/testing/buildbot/chromium.android.fyi.json
@@ -6,6 +6,9 @@
       },
       {
         "test": "base_unittests"
+      },
+      {
+        "test": "blimp_unittests"
       },
       {
         "override_compile_targets": [
@@ -87,6 +90,14 @@
       }
     ],
     "instrumentation_tests": [
+      {
+        "apk_under_test": "Blimp.apk",
+        "override_compile_targets": [
+          "blimp_test_apk"
+        ],
+        "test": "blimp_test_apk",
+        "test_apk": "BlimpTest.apk"
+      },
       {
         "test": "chrome_public_test_apk"
       },
@@ -107,6 +118,9 @@
         "test": "base_unittests"
       },
       {
+        "test": "blimp_unittests"
+      },
+      {
         "override_compile_targets": [
           "breakpad_unittests_deps"
         ],
@@ -188,6 +202,14 @@
     "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"
@@ -209,6 +231,9 @@
         "test": "base_unittests"
       },
       {
+        "test": "blimp_unittests"
+      },
+      {
         "override_compile_targets": [
           "breakpad_unittests_deps"
         ],
@@ -298,6 +323,13 @@
     "instrumentation_tests": [
       {
         "test": "android_webview_test_apk",
+        "timeout_scale": 4
+      },
+      {
+        "override_compile_targets": [
+          "blimp_test_apk"
+        ],
+        "test": "blimp_test_apk",
         "timeout_scale": 4
       },
       {
@@ -1374,6 +1406,12 @@
         "test": "base_unittests"
       },
       {
+        "swarming": {
+          "can_use_on_swarming_builders": false
+        },
+        "test": "blimp_unittests"
+      },
+      {
         "override_compile_targets": [
           "breakpad_unittests_deps"
         ],
@@ -1535,6 +1573,12 @@
     "instrumentation_tests": [
       {
         "test": "android_webview_test_apk"
+      },
+      {
+        "override_compile_targets": [
+          "blimp_test_apk"
+        ],
+        "test": "blimp_test_apk"
       },
       {
         "test": "chrome_public_test_apk"
@@ -1568,6 +1612,12 @@
         "test": "base_unittests"
       },
       {
+        "swarming": {
+          "can_use_on_swarming_builders": false
+        },
+        "test": "blimp_unittests"
+      },
+      {
         "override_compile_targets": [
           "breakpad_unittests_deps"
         ],
@@ -1729,6 +1779,12 @@
     "instrumentation_tests": [
       {
         "test": "android_webview_test_apk"
+      },
+      {
+        "override_compile_targets": [
+          "blimp_test_apk"
+        ],
+        "test": "blimp_test_apk"
       },
       {
         "test": "chrome_public_test_apk"