Revert of Remove Blimp from waterfall configurations and buildbot recipes.

testing/buildbot/chromium.android.fyi.json

 {
   "Jelly Bean 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 60 matching lines @@
       },
       {
         "test": "ui_touch_selection_unittests"
       },
       {
         "test": "unit_tests"
       }
     ],
     "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"
       },
       {
         "test": "chrome_sync_shell_test_apk"
       },
       {
         "test": "content_shell_test_apk"
       }
     ]
   },
   "Lollipop Consumer 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 63 matching lines @@
       },
       {
         "test": "unit_tests"
       }
     ],
     "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"
       }
     ]
   },
   "Lollipop Low-end 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 72 matching lines @@
       {
         "test": "unit_tests"
       }
     ],
     "instrumentation_tests": [
       {
         "test": "android_webview_test_apk",
         "timeout_scale": 4
       },
       {
+        "override_compile_targets": [
+          "blimp_test_apk"
+        ],
+        "test": "blimp_test_apk",
+        "timeout_scale": 4
+      },
+      {
         "test": "chrome_public_test_apk",
         "timeout_scale": 4
       },
       {
         "test": "chrome_sync_shell_test_apk",
         "timeout_scale": 4
       },
       {
         "test": "content_shell_test_apk",
         "timeout_scale": 4
@@ skipping 1053 matching lines @@
         },
         "test": "android_webview_unittests"
       },
       {
         "swarming": {
           "can_use_on_swarming_builders": false
         },
         "test": "base_unittests"
       },
       {
+        "swarming": {
+          "can_use_on_swarming_builders": false
+        },
+        "test": "blimp_unittests"
+      },
+      {
         "override_compile_targets": [
           "breakpad_unittests_deps"
         ],
         "swarming": {
           "can_use_on_swarming_builders": false
         },
         "test": "breakpad_unittests"
       },
       {
         "swarming": {
@@ skipping 143 matching lines @@
           "can_use_on_swarming_builders": false
         },
         "test": "unit_tests"
       }
     ],
     "instrumentation_tests": [
       {
         "test": "android_webview_test_apk"
       },
       {
+        "override_compile_targets": [
+          "blimp_test_apk"
+        ],
+        "test": "blimp_test_apk"
+      },
+      {
         "test": "chrome_public_test_apk"
       },
       {
         "test": "chrome_sync_shell_test_apk"
       },
       {
         "test": "content_shell_test_apk"
       }
     ],
     "scripts": [
@@ skipping 11 matching lines @@
         },
         "test": "android_webview_unittests"
       },
       {
         "swarming": {
           "can_use_on_swarming_builders": false
         },
         "test": "base_unittests"
       },
       {
+        "swarming": {
+          "can_use_on_swarming_builders": false
+        },
+        "test": "blimp_unittests"
+      },
+      {
         "override_compile_targets": [
           "breakpad_unittests_deps"
         ],
         "swarming": {
           "can_use_on_swarming_builders": false
         },
         "test": "breakpad_unittests"
       },
       {
         "swarming": {
@@ skipping 143 matching lines @@
           "can_use_on_swarming_builders": false
         },
         "test": "unit_tests"
       }
     ],
     "instrumentation_tests": [
       {
         "test": "android_webview_test_apk"
       },
       {
+        "override_compile_targets": [
+          "blimp_test_apk"
+        ],
+        "test": "blimp_test_apk"
+      },
+      {
         "test": "chrome_public_test_apk"
       },
       {
         "test": "chrome_sync_shell_test_apk"
       },
       {
         "test": "content_shell_test_apk"
       }
     ],
     "scripts": [
       {
         "name": "telemetry_perf_unittests",
         "script": "telemetry_perf_unittests.py"
       }
     ]
   }
 }