Revert of Remove Blimp from waterfall configurations and buildbot recipes.

testing/buildbot/gn_isolate_map.pyl

 ## Copyright 2015 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.
 
 # gn_isolate_map.pyl - A mapping of Ninja build target names to GN labels and
 # test type classifications for the tests that are run on the bots.
 #
 # This mapping is used by MB so that we can uniformly refer to test binaries
 # by their Ninja target names in the recipes and not need to worry about how
 # they are referred to in GN or GYP specifically (the GYP target name is pretty
@@ skipping 145 matching lines @@
     "type": "junit_test",
   },
   "base_unittests": {
     "label": "//base:base_unittests",
     "type": "console_test_launcher",
   },
   "battor_agent_unittests": {
     "label": "//tools/battor_agent:battor_agent_unittests",
     "type": "console_test_launcher",
   },
+  "blimp_browsertests": {
+    "label": "//blimp:blimp_browsertests",
+    "type": "console_test_launcher",
+  },
+  "blimp_test_apk": {
+    "label": "//blimp/client/app:blimp_test_apk",
+    "type": "console_test_launcher",
+  },
+  "blimp_unittests": {
+    "label": "//blimp:blimp_unittests",
+    "type": "console_test_launcher",
+  },
   "blink_heap_unittests": {
     "label": "//third_party/WebKit/Source/platform/heap:blink_heap_unittests",
     "type": "console_test_launcher",
   },
   "blink_platform_unittests": {
     "label": "//third_party/WebKit/Source/platform:blink_platform_unittests",
     "type": "console_test_launcher",
   },
   "blink_tests": {
     "label": "//:blink_tests",
@@ skipping 805 matching lines @@
   },
   "wm_unittests": {
     "label": "//ui/wm:wm_unittests",
     "type": "windowed_test_launcher",
   },
   "wtf_unittests": {
     "label": "//third_party/WebKit/Source/wtf:wtf_unittests",
     "type": "console_test_launcher",
   },
 }