Revert "Use bundled recipes on all Test/Perf tasks"

This reverts commit 43b9c6bbf66b0927a99062c68dff9ea8358f82db.

Reason for revert: Windows failing

Original change's description:
> Use bundled recipes on all Test/Perf tasks
> 
> It won't save as much time for faster machines, but it should still
> shave a few seconds, and it'll be nice to be consistent.
> 
> Bug: skia:5813
> Change-Id: I5724e7aae83851edff3129265a9ffee5c3f95825
> Reviewed-on: https://skia-review.googlesource.com/11340
> Commit-Queue: Eric Boren <borenet@google.com>
> Reviewed-by: Kevin Lubick <kjlubick@google.com>
> 

TBR=borenet@google.com,kjlubick@google.com,reviews@skia.org,iannucci@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true

Change-Id: I2a9cc1c12079755969879e37da5cae9f93921ddd
Reviewed-on: https://skia-review.googlesource.com/11416
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Eric Boren <borenet@google.com>
diff --git a/infra/bots/gen_tasks.go b/infra/bots/gen_tasks.go
index 71a53a2..0301034 100644
--- a/infra/bots/gen_tasks.go
+++ b/infra/bots/gen_tasks.go
@@ -244,13 +244,6 @@
 	return BUNDLE_RECIPES_NAME
 }
 
-// useBundledRecipes returns true iff the given bot should use bundled recipes
-// instead of syncing recipe DEPS itself.
-func useBundledRecipes(parts map[string]string) bool {
-	// Use bundled recipes for all test/perf tasks.
-	return true
-}
-
 // compile generates a compile task. Returns the name of the last task in the
 // generated chain of tasks, which the Job should add as a dependency.
 func compile(b *specs.TasksCfgBuilder, name string, parts map[string]string) string {
@@ -484,7 +477,7 @@
 		MaxAttempts: 1,
 		Priority:    0.8,
 	}
-	if useBundledRecipes(parts) {
+	if parts["os"] == "Android" {
 		s.Dependencies = append(s.Dependencies, BUNDLE_RECIPES_NAME)
 		s.Isolate = "test_skia_bundled.isolate"
 	}
@@ -534,10 +527,10 @@
 	if strings.Contains(parts["extra_config"], "Skpbench") {
 		recipe = "swarm_skpbench"
 		isolate = "skpbench_skia.isolate"
-		if useBundledRecipes(parts) {
+		if parts["os"] == "Android" {
 			isolate = "skpbench_skia_bundled.isolate"
 		}
-	} else if useBundledRecipes(parts) {
+	} else if parts["os"] == "Android" {
 		isolate = "perf_skia_bundled.isolate"
 	}
 	s := &specs.TaskSpec{
@@ -565,7 +558,7 @@
 		MaxAttempts: 1,
 		Priority:    0.8,
 	}
-	if useBundledRecipes(parts) {
+	if parts["os"] == "Android" {
 		s.Dependencies = append(s.Dependencies, BUNDLE_RECIPES_NAME)
 	}
 	if strings.Contains(parts["extra_config"], "Valgrind") {
diff --git a/infra/bots/recipe_modules/flavor/resources/symbolize_stack_trace.py b/infra/bots/recipe_modules/core/resources/symbolize_stack_trace.py
similarity index 100%
rename from infra/bots/recipe_modules/flavor/resources/symbolize_stack_trace.py
rename to infra/bots/recipe_modules/core/resources/symbolize_stack_trace.py
diff --git a/infra/bots/recipe_modules/flavor/api.py b/infra/bots/recipe_modules/flavor/api.py
index 9d64a32..5820e0b 100644
--- a/infra/bots/recipe_modules/flavor/api.py
+++ b/infra/bots/recipe_modules/flavor/api.py
@@ -58,21 +58,21 @@
   def get_flavor(self, builder_cfg):
     """Return a flavor utils object specific to the given builder."""
     if is_flutter(builder_cfg):
-      return flutter_flavor.FlutterFlavorUtils(self)
+      return flutter_flavor.FlutterFlavorUtils(self.m)
     if is_chromecast(builder_cfg):
-      return gn_chromecast_flavor.GNChromecastFlavorUtils(self)
+      return gn_chromecast_flavor.GNChromecastFlavorUtils(self.m)
     if is_chromebook(builder_cfg):
-      return gn_chromebook_flavor.GNChromebookFlavorUtils(self)
+      return gn_chromebook_flavor.GNChromebookFlavorUtils(self.m)
     if is_android(builder_cfg):
-      return gn_android_flavor.GNAndroidFlavorUtils(self)
+      return gn_android_flavor.GNAndroidFlavorUtils(self.m)
     elif is_ios(builder_cfg):
-      return ios_flavor.iOSFlavorUtils(self)
+      return ios_flavor.iOSFlavorUtils(self.m)
     elif is_pdfium(builder_cfg):
-      return pdfium_flavor.PDFiumFlavorUtils(self)
+      return pdfium_flavor.PDFiumFlavorUtils(self.m)
     elif is_valgrind(builder_cfg):
-      return valgrind_flavor.ValgrindFlavorUtils(self)
+      return valgrind_flavor.ValgrindFlavorUtils(self.m)
     else:
-      return gn_flavor.GNFlavorUtils(self)
+      return gn_flavor.GNFlavorUtils(self.m)
 
   def setup(self):
     self._f = self.get_flavor(self.m.vars.builder_cfg)
diff --git a/infra/bots/recipe_modules/flavor/default_flavor.py b/infra/bots/recipe_modules/flavor/default_flavor.py
index 079cbc4..dacb0fd 100644
--- a/infra/bots/recipe_modules/flavor/default_flavor.py
+++ b/infra/bots/recipe_modules/flavor/default_flavor.py
@@ -75,9 +75,8 @@
   copying files between the host and Android device, as well as the
   'step' function, so that commands may be run through ADB.
   """
-  def __init__(self, module):
-    self.module = module
-    self.m = module.m
+  def __init__(self, m):
+    self.m = m
     self._chrome_path = None
     self._win_toolchain_dir = self.m.vars.slave_dir.join(WIN_TOOLCHAIN_DIR)
     win_toolchain_asset_path = self.m.vars.infrabots_dir.join(
diff --git a/infra/bots/recipe_modules/flavor/gn_flavor.py b/infra/bots/recipe_modules/flavor/gn_flavor.py
index bf23375..4ee2f8e 100644
--- a/infra/bots/recipe_modules/flavor/gn_flavor.py
+++ b/infra/bots/recipe_modules/flavor/gn_flavor.py
@@ -170,7 +170,8 @@
       args = [self.m.vars.slave_dir] + [str(x) for x in cmd]
       with self.m.step.context({'cwd': self.m.vars.skia_dir, 'env': env}):
         self._py('symbolized %s' % name,
-                 self.module.resource('symbolize_stack_trace.py'),
+                 self.m.vars.infrabots_dir.join('recipe_modules', 'core',
+                 'resources', 'symbolize_stack_trace.py'),
                  args=args,
                  infra_step=False)
 
diff --git a/infra/bots/recipe_modules/perf/example.expected/Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-GN.json b/infra/bots/recipe_modules/perf/example.expected/Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-GN.json
index f8e8d87..86d4898 100644
--- a/infra/bots/recipe_modules/perf/example.expected/Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-GN.json
+++ b/infra/bots/recipe_modules/perf/example.expected/Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-GN.json
@@ -106,7 +106,7 @@
     "cmd": [
       "python",
       "-u",
-      "RECIPE_MODULE[skia::flavor]/resources/symbolize_stack_trace.py",
+      "[START_DIR]/skia/infra/bots/recipe_modules/core/resources/symbolize_stack_trace.py",
       "[START_DIR]",
       "catchsegv",
       "[START_DIR]/out/Release/nanobench",
diff --git a/infra/bots/recipe_modules/perf/example.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-ANGLE.json b/infra/bots/recipe_modules/perf/example.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-ANGLE.json
index 3e8f9ad..04dade4 100644
--- a/infra/bots/recipe_modules/perf/example.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-ANGLE.json
+++ b/infra/bots/recipe_modules/perf/example.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-ANGLE.json
@@ -106,7 +106,7 @@
     "cmd": [
       "python",
       "-u",
-      "RECIPE_MODULE[skia::flavor]/resources/symbolize_stack_trace.py",
+      "[START_DIR]/skia/infra/bots/recipe_modules/core/resources/symbolize_stack_trace.py",
       "[START_DIR]",
       "catchsegv",
       "[START_DIR]/out/Release/nanobench",
diff --git a/infra/bots/recipe_modules/perf/example.expected/Perf-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Debug-Vulkan.json b/infra/bots/recipe_modules/perf/example.expected/Perf-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Debug-Vulkan.json
index 938c969..b939b62 100644
--- a/infra/bots/recipe_modules/perf/example.expected/Perf-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Debug-Vulkan.json
+++ b/infra/bots/recipe_modules/perf/example.expected/Perf-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Debug-Vulkan.json
@@ -69,7 +69,7 @@
     "cmd": [
       "python",
       "-u",
-      "RECIPE_MODULE[skia::flavor]/resources/symbolize_stack_trace.py",
+      "[START_DIR]/skia/infra/bots/recipe_modules/core/resources/symbolize_stack_trace.py",
       "[START_DIR]",
       "[START_DIR]/out/Debug/nanobench",
       "--undefok",
diff --git a/infra/bots/recipe_modules/perf/example.expected/Perf-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Release.json b/infra/bots/recipe_modules/perf/example.expected/Perf-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Release.json
index 11020f7..a319907 100644
--- a/infra/bots/recipe_modules/perf/example.expected/Perf-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Release.json
+++ b/infra/bots/recipe_modules/perf/example.expected/Perf-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Release.json
@@ -106,7 +106,7 @@
     "cmd": [
       "python",
       "-u",
-      "RECIPE_MODULE[skia::flavor]/resources/symbolize_stack_trace.py",
+      "[START_DIR]/skia/infra/bots/recipe_modules/core/resources/symbolize_stack_trace.py",
       "[START_DIR]",
       "[START_DIR]/out/Release/nanobench",
       "--undefok",
diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug.json
index 3fc53d9..26c7b2c 100644
--- a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug.json
+++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug.json
@@ -178,7 +178,7 @@
     "cmd": [
       "python",
       "-u",
-      "RECIPE_MODULE[skia::flavor]/resources/symbolize_stack_trace.py",
+      "[START_DIR]/skia/infra/bots/recipe_modules/core/resources/symbolize_stack_trace.py",
       "[START_DIR]",
       "catchsegv",
       "[START_DIR]/out/Debug/dm",
diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-ASAN.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-ASAN.json
index 51393cc..7f8ab95 100644
--- a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-ASAN.json
+++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-ASAN.json
@@ -69,7 +69,7 @@
     "cmd": [
       "python",
       "-u",
-      "RECIPE_MODULE[skia::flavor]/resources/symbolize_stack_trace.py",
+      "[START_DIR]/skia/infra/bots/recipe_modules/core/resources/symbolize_stack_trace.py",
       "[START_DIR]",
       "[START_DIR]/out/Debug/dm",
       "--undefok",
diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN.json
index 7325204..f7532e0 100644
--- a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN.json
+++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN.json
@@ -69,7 +69,7 @@
     "cmd": [
       "python",
       "-u",
-      "RECIPE_MODULE[skia::flavor]/resources/symbolize_stack_trace.py",
+      "[START_DIR]/skia/infra/bots/recipe_modules/core/resources/symbolize_stack_trace.py",
       "[START_DIR]",
       "[START_DIR]/out/Debug/dm",
       "--undefok",
diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json
index 20d0961..b56a562 100644
--- a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json
+++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json
@@ -178,7 +178,7 @@
     "cmd": [
       "python",
       "-u",
-      "RECIPE_MODULE[skia::flavor]/resources/symbolize_stack_trace.py",
+      "[START_DIR]/skia/infra/bots/recipe_modules/core/resources/symbolize_stack_trace.py",
       "[START_DIR]",
       "catchsegv",
       "[START_DIR]/out/Debug/dm",
diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json
index b0144aa..62bbb7b 100644
--- a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json
+++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json
@@ -178,7 +178,7 @@
     "cmd": [
       "python",
       "-u",
-      "RECIPE_MODULE[skia::flavor]/resources/symbolize_stack_trace.py",
+      "[START_DIR]/skia/infra/bots/recipe_modules/core/resources/symbolize_stack_trace.py",
       "[START_DIR]",
       "catchsegv",
       "[START_DIR]/out/Debug/dm",
diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared.json
index 0b97814..34184d2 100644
--- a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared.json
+++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared.json
@@ -178,7 +178,7 @@
     "cmd": [
       "python",
       "-u",
-      "RECIPE_MODULE[skia::flavor]/resources/symbolize_stack_trace.py",
+      "[START_DIR]/skia/infra/bots/recipe_modules/core/resources/symbolize_stack_trace.py",
       "[START_DIR]",
       "catchsegv",
       "[START_DIR]/out/Release/dm",
diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-TSAN.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-TSAN.json
index e2b1084..e670711 100644
--- a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-TSAN.json
+++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-TSAN.json
@@ -69,7 +69,7 @@
     "cmd": [
       "python",
       "-u",
-      "RECIPE_MODULE[skia::flavor]/resources/symbolize_stack_trace.py",
+      "[START_DIR]/skia/infra/bots/recipe_modules/core/resources/symbolize_stack_trace.py",
       "[START_DIR]",
       "[START_DIR]/out/Release/dm",
       "--undefok",
diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Debug-Vulkan.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Debug-Vulkan.json
index fa8a549..bef6905 100644
--- a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Debug-Vulkan.json
+++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Debug-Vulkan.json
@@ -178,7 +178,7 @@
     "cmd": [
       "python",
       "-u",
-      "RECIPE_MODULE[skia::flavor]/resources/symbolize_stack_trace.py",
+      "[START_DIR]/skia/infra/bots/recipe_modules/core/resources/symbolize_stack_trace.py",
       "[START_DIR]",
       "[START_DIR]/out/Debug/dm",
       "--undefok",
diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Release.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Release.json
index 21e41d0..3b81c5a 100644
--- a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Release.json
+++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Release.json
@@ -178,7 +178,7 @@
     "cmd": [
       "python",
       "-u",
-      "RECIPE_MODULE[skia::flavor]/resources/symbolize_stack_trace.py",
+      "[START_DIR]/skia/infra/bots/recipe_modules/core/resources/symbolize_stack_trace.py",
       "[START_DIR]",
       "[START_DIR]/out/Release/dm",
       "--undefok",
diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug.json
index 2bb6a99..f26b969 100644
--- a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug.json
+++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug.json
@@ -178,7 +178,7 @@
     "cmd": [
       "python",
       "-u",
-      "RECIPE_MODULE[skia::flavor]/resources/symbolize_stack_trace.py",
+      "[START_DIR]/skia/infra/bots/recipe_modules/core/resources/symbolize_stack_trace.py",
       "[START_DIR]",
       "[START_DIR]/out/Debug/dm",
       "--undefok",
diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu16-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Debug.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu16-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Debug.json
index 5cbfed2..7094804 100644
--- a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu16-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Debug.json
+++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu16-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Debug.json
@@ -178,7 +178,7 @@
     "cmd": [
       "python",
       "-u",
-      "RECIPE_MODULE[skia::flavor]/resources/symbolize_stack_trace.py",
+      "[START_DIR]/skia/infra/bots/recipe_modules/core/resources/symbolize_stack_trace.py",
       "[START_DIR]",
       "[START_DIR]/out/Debug/dm",
       "--undefok",
diff --git a/infra/bots/recipe_modules/sktest/example.expected/failed_dm.json b/infra/bots/recipe_modules/sktest/example.expected/failed_dm.json
index 4ba8736..bc89138 100644
--- a/infra/bots/recipe_modules/sktest/example.expected/failed_dm.json
+++ b/infra/bots/recipe_modules/sktest/example.expected/failed_dm.json
@@ -178,7 +178,7 @@
     "cmd": [
       "python",
       "-u",
-      "RECIPE_MODULE[skia::flavor]/resources/symbolize_stack_trace.py",
+      "[START_DIR]/skia/infra/bots/recipe_modules/core/resources/symbolize_stack_trace.py",
       "[START_DIR]",
       "catchsegv",
       "[START_DIR]/out/Debug/dm",
diff --git a/infra/bots/recipe_modules/sktest/example.expected/nobuildbot.json b/infra/bots/recipe_modules/sktest/example.expected/nobuildbot.json
index 7ed2d78..55ee548 100644
--- a/infra/bots/recipe_modules/sktest/example.expected/nobuildbot.json
+++ b/infra/bots/recipe_modules/sktest/example.expected/nobuildbot.json
@@ -206,7 +206,7 @@
     "cmd": [
       "python",
       "-u",
-      "RECIPE_MODULE[skia::flavor]/resources/symbolize_stack_trace.py",
+      "[START_DIR]/skia/infra/bots/recipe_modules/core/resources/symbolize_stack_trace.py",
       "[START_DIR]",
       "catchsegv",
       "[START_DIR]/out/Debug/dm",
diff --git a/infra/bots/recipe_modules/sktest/example.expected/recipe_with_gerrit_patch.json b/infra/bots/recipe_modules/sktest/example.expected/recipe_with_gerrit_patch.json
index fe84d7d..003d305 100644
--- a/infra/bots/recipe_modules/sktest/example.expected/recipe_with_gerrit_patch.json
+++ b/infra/bots/recipe_modules/sktest/example.expected/recipe_with_gerrit_patch.json
@@ -178,7 +178,7 @@
     "cmd": [
       "python",
       "-u",
-      "RECIPE_MODULE[skia::flavor]/resources/symbolize_stack_trace.py",
+      "[START_DIR]/skia/infra/bots/recipe_modules/core/resources/symbolize_stack_trace.py",
       "[START_DIR]",
       "catchsegv",
       "[START_DIR]/out/Debug/dm",
diff --git a/infra/bots/recipes/bundle_recipes.expected/BundleRecipes.json b/infra/bots/recipes/bundle_recipes.expected/BundleRecipes.json
index 4ecab71..a4c1914 100644
--- a/infra/bots/recipes/bundle_recipes.expected/BundleRecipes.json
+++ b/infra/bots/recipes/bundle_recipes.expected/BundleRecipes.json
@@ -35,10 +35,6 @@
       "{\"skia\": \"got_revision\"}",
       "--git-cache-dir",
       "[CUSTOM_/_B_CACHE]",
-      "--issue",
-      "10101",
-      "--patchset",
-      "3",
       "--output_json",
       "/path/to/tmp/json",
       "--revision",
@@ -82,31 +78,10 @@
   },
   {
     "cmd": [
-      "git",
-      "commit",
-      "-a",
-      "-m",
-      "Commit Patch"
-    ],
-    "cwd": "[CUSTOM_/_B_WORK]/skia",
-    "env": {
-      "BUILDTYPE": "Release",
-      "CHROME_HEADLESS": "1",
-      "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
-      "SKIA_OUT": "[START_DIR]/out"
-    },
-    "infra_step": true,
-    "name": "Commit Patch"
-  },
-  {
-    "cmd": [
       "python",
       "[CUSTOM_/_B_WORK]/skia/infra/bots/recipes.py",
-      "bundle",
-      "--destination",
-      "[CUSTOM_[SWARM_OUT_DIR]]/recipe_bundle"
+      "bundle"
     ],
-    "cwd": "[CUSTOM_/_B_WORK]/skia",
     "env": {
       "BUILDTYPE": "Release",
       "CHROME_HEADLESS": "1",
@@ -117,6 +92,17 @@
     "name": "Bundle Recipes"
   },
   {
+    "cmd": [
+      "python",
+      "-u",
+      "\nimport shutil\nimport sys\nshutil.copytree(sys.argv[1], sys.argv[2], symlinks=bool(sys.argv[3]))\n",
+      "[START_DIR]/bundle",
+      "[CUSTOM_[SWARM_OUT_DIR]]/recipe_bundle",
+      "0"
+    ],
+    "name": "Copy Recipe Bundle"
+  },
+  {
     "name": "$result",
     "recipe_result": null,
     "status_code": 0
diff --git a/infra/bots/recipes/bundle_recipes.py b/infra/bots/recipes/bundle_recipes.py
index fb22103..8a16874 100644
--- a/infra/bots/recipes/bundle_recipes.py
+++ b/infra/bots/recipes/bundle_recipes.py
@@ -19,17 +19,12 @@
 
 def RunSteps(api):
   api.core.setup()
-
-  bundle_dir = api.vars.swarming_out_dir.join('recipe_bundle')
-  with api.step.context({'cwd': api.vars.skia_dir}):
-    if api.vars.is_trybot:
-      # Recipe bundling requires that any changes be committed.
-      api.run(api.step, 'Commit Patch', infra_step=True,
-              cmd=['git', 'commit', '-a', '-m', 'Commit Patch'])
-    recipes_py = api.vars.infrabots_dir.join('recipes.py')
-    api.run(api.step, 'Bundle Recipes', infra_step=True,
-            cmd=['python', recipes_py, 'bundle', '--destination', bundle_dir])
-
+  recipes_py = api.vars.infrabots_dir.join('recipes.py')
+  api.run(api.step, 'Bundle Recipes', infra_step=True,
+          cmd=['python', recipes_py, 'bundle'])
+  src_dir = api.path['start_dir'].join('bundle')
+  dst_dir = api.vars.swarming_out_dir.join('recipe_bundle')
+  api.shutil.copytree('Copy Recipe Bundle', src_dir, dst_dir)
   api.run.check_failure()
 
 
@@ -43,10 +38,7 @@
                    repository='https://skia.googlesource.com/skia.git',
                    revision='abc123',
                    path_config='kitchen',
-                   swarm_out_dir='[SWARM_OUT_DIR]',
-                   nobuildbot='True',
-                   patch_issue='10101',
-                   patch_set='3') +
+                   swarm_out_dir='[SWARM_OUT_DIR]') +
     api.path.exists(
         api.path['start_dir'].join('tmp', 'uninteresting_hashes.txt')
     )
diff --git a/infra/bots/recipes/swarm_perf.expected/Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release.json b/infra/bots/recipes/swarm_perf.expected/Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release.json
index b46c436..ad50d17 100644
--- a/infra/bots/recipes/swarm_perf.expected/Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release.json
+++ b/infra/bots/recipes/swarm_perf.expected/Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release.json
@@ -106,7 +106,7 @@
     "cmd": [
       "python",
       "-u",
-      "RECIPE_MODULE[skia::flavor]/resources/symbolize_stack_trace.py",
+      "[START_DIR]/skia/infra/bots/recipe_modules/core/resources/symbolize_stack_trace.py",
       "[START_DIR]",
       "catchsegv",
       "[START_DIR]/out/Release/nanobench",
diff --git a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug.json b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug.json
index 898d178..5c003f9 100644
--- a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug.json
+++ b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug.json
@@ -178,7 +178,7 @@
     "cmd": [
       "python",
       "-u",
-      "RECIPE_MODULE[skia::flavor]/resources/symbolize_stack_trace.py",
+      "[START_DIR]/skia/infra/bots/recipe_modules/core/resources/symbolize_stack_trace.py",
       "[START_DIR]",
       "catchsegv",
       "[START_DIR]/out/Debug/dm",
diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index 3099a12..cc6f585 100644
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -6118,8 +6118,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-GCC-arm-Debug-Chromecast",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Ubuntu-GCC-arm-Debug-Chromecast"
       ],
       "dimensions": [
         "device_os:1.24_82923",
@@ -6146,7 +6145,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "perf_skia_bundled.isolate",
+      "isolate": "perf_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -6159,8 +6158,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-GCC-arm-Release-Chromecast",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Ubuntu-GCC-arm-Release-Chromecast"
       ],
       "dimensions": [
         "device_os:1.24_82923",
@@ -6187,7 +6185,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "perf_skia_bundled.isolate",
+      "isolate": "perf_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -6210,8 +6208,7 @@
         }
       ],
       "dependencies": [
-        "Build-Mac-Clang-x86_64-Debug",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Mac-Clang-x86_64-Debug"
       ],
       "dimensions": [
         "gpu:10de:08a4",
@@ -6237,7 +6234,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "perf_skia_bundled.isolate",
+      "isolate": "perf_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -6260,8 +6257,7 @@
         }
       ],
       "dependencies": [
-        "Build-Mac-Clang-x86_64-Release",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Mac-Clang-x86_64-Release"
       ],
       "dimensions": [
         "gpu:10de:08a4",
@@ -6287,7 +6283,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "perf_skia_bundled.isolate",
+      "isolate": "perf_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -6310,8 +6306,7 @@
         }
       ],
       "dependencies": [
-        "Build-Mac-Clang-x86_64-Debug",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Mac-Clang-x86_64-Debug"
       ],
       "dimensions": [
         "cpu:x86-64",
@@ -6338,7 +6333,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "perf_skia_bundled.isolate",
+      "isolate": "perf_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -6361,8 +6356,7 @@
         }
       ],
       "dependencies": [
-        "Build-Mac-Clang-x86_64-Release",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Mac-Clang-x86_64-Release"
       ],
       "dimensions": [
         "cpu:x86-64",
@@ -6389,7 +6383,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "perf_skia_bundled.isolate",
+      "isolate": "perf_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -6412,8 +6406,7 @@
         }
       ],
       "dependencies": [
-        "Build-Mac-Clang-x86_64-Debug",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Mac-Clang-x86_64-Debug"
       ],
       "dimensions": [
         "gpu:8086:0a2e",
@@ -6439,7 +6432,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "perf_skia_bundled.isolate",
+      "isolate": "perf_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -6462,8 +6455,7 @@
         }
       ],
       "dependencies": [
-        "Build-Mac-Clang-x86_64-Release",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Mac-Clang-x86_64-Release"
       ],
       "dimensions": [
         "gpu:8086:0a2e",
@@ -6489,7 +6481,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "perf_skia_bundled.isolate",
+      "isolate": "perf_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -6512,8 +6504,7 @@
         }
       ],
       "dependencies": [
-        "Build-Mac-Clang-x86_64-Release-CommandBuffer",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Mac-Clang-x86_64-Release-CommandBuffer"
       ],
       "dimensions": [
         "gpu:8086:0a2e",
@@ -6539,7 +6530,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "perf_skia_bundled.isolate",
+      "isolate": "perf_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -6562,8 +6553,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86_64-Debug",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Ubuntu-Clang-x86_64-Debug"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -6590,7 +6580,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "perf_skia_bundled.isolate",
+      "isolate": "perf_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -6618,8 +6608,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86_64-Debug-ASAN",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Ubuntu-Clang-x86_64-Debug-ASAN"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -6646,7 +6635,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "perf_skia_bundled.isolate",
+      "isolate": "perf_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -6674,8 +6663,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86_64-Debug-MSAN",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Ubuntu-Clang-x86_64-Debug-MSAN"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -6702,7 +6690,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "perf_skia_bundled.isolate",
+      "isolate": "perf_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -6725,8 +6713,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86_64-Release",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Ubuntu-Clang-x86_64-Release"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -6753,7 +6740,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "perf_skia_bundled.isolate",
+      "isolate": "perf_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -6781,8 +6768,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86_64-Release-ASAN",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Ubuntu-Clang-x86_64-Release-ASAN"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -6809,7 +6795,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "perf_skia_bundled.isolate",
+      "isolate": "perf_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -6832,8 +6818,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86_64-Release-Fast",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Ubuntu-Clang-x86_64-Release-Fast"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -6860,7 +6845,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "perf_skia_bundled.isolate",
+      "isolate": "perf_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -6888,8 +6873,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86_64-Debug-ASAN",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Ubuntu-Clang-x86_64-Debug-ASAN"
       ],
       "dimensions": [
         "gpu:10de:104a",
@@ -6915,7 +6899,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "perf_skia_bundled.isolate",
+      "isolate": "perf_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -6943,8 +6927,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86_64-Release-ASAN",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Ubuntu-Clang-x86_64-Release-ASAN"
       ],
       "dimensions": [
         "gpu:10de:104a",
@@ -6970,7 +6953,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "perf_skia_bundled.isolate",
+      "isolate": "perf_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -6993,8 +6976,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-GCC-x86-Debug",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Ubuntu-GCC-x86-Debug"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -7021,7 +7003,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "perf_skia_bundled.isolate",
+      "isolate": "perf_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -7044,8 +7026,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-GCC-x86_64-Debug",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Ubuntu-GCC-x86_64-Debug"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -7072,7 +7053,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "perf_skia_bundled.isolate",
+      "isolate": "perf_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -7095,8 +7076,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-GCC-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Ubuntu-GCC-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -7123,7 +7103,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "perf_skia_bundled.isolate",
+      "isolate": "perf_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -7146,8 +7126,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-GCC-x86_64-Release",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Ubuntu-GCC-x86_64-Release"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -7174,7 +7153,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "perf_skia_bundled.isolate",
+      "isolate": "perf_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -7247,8 +7226,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-GCC-x86_64-Release",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Ubuntu-GCC-x86_64-Release"
       ],
       "dimensions": [
         "gpu:10de:1244",
@@ -7274,7 +7252,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 3600000000000,
-      "isolate": "perf_skia_bundled.isolate",
+      "isolate": "perf_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -7297,8 +7275,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-GCC-x86_64-Release",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Ubuntu-GCC-x86_64-Release"
       ],
       "dimensions": [
         "gpu:10de:1244",
@@ -7324,7 +7301,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 3600000000000,
-      "isolate": "perf_skia_bundled.isolate",
+      "isolate": "perf_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -7347,8 +7324,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-GCC-x86_64-Debug",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Ubuntu-GCC-x86_64-Debug"
       ],
       "dimensions": [
         "gpu:10de:11c0",
@@ -7374,7 +7350,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "perf_skia_bundled.isolate",
+      "isolate": "perf_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -7397,8 +7373,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-GCC-x86_64-Release",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Ubuntu-GCC-x86_64-Release"
       ],
       "dimensions": [
         "gpu:10de:11c0",
@@ -7424,7 +7399,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "perf_skia_bundled.isolate",
+      "isolate": "perf_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -7447,8 +7422,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-GCC-x86_64-Debug",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Ubuntu-GCC-x86_64-Debug"
       ],
       "dimensions": [
         "gpu:10de:1401",
@@ -7474,7 +7448,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "perf_skia_bundled.isolate",
+      "isolate": "perf_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -7497,8 +7471,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-GCC-x86_64-Release",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Ubuntu-GCC-x86_64-Release"
       ],
       "dimensions": [
         "gpu:10de:1401",
@@ -7524,7 +7497,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "perf_skia_bundled.isolate",
+      "isolate": "perf_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -7552,8 +7525,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86_64-Debug",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Ubuntu-Clang-x86_64-Debug"
       ],
       "dimensions": [
         "gpu:8086:22b1",
@@ -7579,7 +7551,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "perf_skia_bundled.isolate",
+      "isolate": "perf_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -7607,8 +7579,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86_64-Release",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Ubuntu-Clang-x86_64-Release"
       ],
       "dimensions": [
         "gpu:8086:22b1",
@@ -7634,7 +7605,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "perf_skia_bundled.isolate",
+      "isolate": "perf_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -7662,8 +7633,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86_64-Debug",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Ubuntu-Clang-x86_64-Debug"
       ],
       "dimensions": [
         "gpu:8086:1926",
@@ -7689,7 +7659,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "perf_skia_bundled.isolate",
+      "isolate": "perf_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -7722,8 +7692,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86_64-Debug-Vulkan",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Ubuntu-Clang-x86_64-Debug-Vulkan"
       ],
       "dimensions": [
         "gpu:8086:1926",
@@ -7749,7 +7718,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "perf_skia_bundled.isolate",
+      "isolate": "perf_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -7777,8 +7746,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86_64-Release",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Ubuntu-Clang-x86_64-Release"
       ],
       "dimensions": [
         "gpu:8086:1926",
@@ -7804,7 +7772,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "perf_skia_bundled.isolate",
+      "isolate": "perf_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -7837,8 +7805,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86_64-Release-Vulkan",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Ubuntu-Clang-x86_64-Release-Vulkan"
       ],
       "dimensions": [
         "gpu:8086:1926",
@@ -7864,7 +7831,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "perf_skia_bundled.isolate",
+      "isolate": "perf_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -7892,8 +7859,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86_64-Debug",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Ubuntu-Clang-x86_64-Debug"
       ],
       "dimensions": [
         "gpu:8086:0f31",
@@ -7919,7 +7885,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "perf_skia_bundled.isolate",
+      "isolate": "perf_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -7947,8 +7913,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86_64-Release",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Ubuntu-Clang-x86_64-Release"
       ],
       "dimensions": [
         "gpu:8086:0f31",
@@ -7974,7 +7939,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "perf_skia_bundled.isolate",
+      "isolate": "perf_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -8002,8 +7967,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86_64-Debug",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Ubuntu-Clang-x86_64-Debug"
       ],
       "dimensions": [
         "gpu:8086:0102",
@@ -8029,7 +7993,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "perf_skia_bundled.isolate",
+      "isolate": "perf_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -8057,8 +8021,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86_64-Release",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Ubuntu-Clang-x86_64-Release"
       ],
       "dimensions": [
         "gpu:8086:0102",
@@ -8084,7 +8047,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "perf_skia_bundled.isolate",
+      "isolate": "perf_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -8107,8 +8070,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Win-MSVC-x86_64-Debug"
       ],
       "dimensions": [
         "gpu:1002:6646",
@@ -8134,7 +8096,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "perf_skia_bundled.isolate",
+      "isolate": "perf_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -8157,8 +8119,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug-ANGLE",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Win-MSVC-x86_64-Debug-ANGLE"
       ],
       "dimensions": [
         "gpu:1002:6646",
@@ -8184,7 +8145,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "perf_skia_bundled.isolate",
+      "isolate": "perf_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -8207,8 +8168,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug-Vulkan",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Win-MSVC-x86_64-Debug-Vulkan"
       ],
       "dimensions": [
         "gpu:1002:6646",
@@ -8234,7 +8194,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "perf_skia_bundled.isolate",
+      "isolate": "perf_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -8257,8 +8217,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Release",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Win-MSVC-x86_64-Release"
       ],
       "dimensions": [
         "gpu:1002:6646",
@@ -8284,7 +8243,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "perf_skia_bundled.isolate",
+      "isolate": "perf_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -8307,8 +8266,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Release-ANGLE",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Win-MSVC-x86_64-Release-ANGLE"
       ],
       "dimensions": [
         "gpu:1002:6646",
@@ -8334,7 +8292,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "perf_skia_bundled.isolate",
+      "isolate": "perf_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -8357,8 +8315,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Release-Vulkan",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Win-MSVC-x86_64-Release-Vulkan"
       ],
       "dimensions": [
         "gpu:1002:6646",
@@ -8384,7 +8341,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "perf_skia_bundled.isolate",
+      "isolate": "perf_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -8407,8 +8364,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Release",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Win-MSVC-x86_64-Release"
       ],
       "dimensions": [
         "gpu:10de:104a",
@@ -8434,7 +8390,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "perf_skia_bundled.isolate",
+      "isolate": "perf_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -8457,8 +8413,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug-ANGLE",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Win-MSVC-x86_64-Debug-ANGLE"
       ],
       "dimensions": [
         "gpu:8086:162b",
@@ -8484,7 +8439,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "perf_skia_bundled.isolate",
+      "isolate": "perf_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -8507,8 +8462,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Release-ANGLE",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Win-MSVC-x86_64-Release-ANGLE"
       ],
       "dimensions": [
         "gpu:8086:162b",
@@ -8534,7 +8488,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "perf_skia_bundled.isolate",
+      "isolate": "perf_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -8557,8 +8511,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Win-MSVC-x86_64-Debug"
       ],
       "dimensions": [
         "gpu:8086:1926",
@@ -8584,7 +8537,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "perf_skia_bundled.isolate",
+      "isolate": "perf_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -8607,8 +8560,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug-ANGLE",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Win-MSVC-x86_64-Debug-ANGLE"
       ],
       "dimensions": [
         "gpu:8086:1926",
@@ -8634,7 +8586,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "perf_skia_bundled.isolate",
+      "isolate": "perf_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -8657,8 +8609,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug-Vulkan",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Win-MSVC-x86_64-Debug-Vulkan"
       ],
       "dimensions": [
         "gpu:8086:1926",
@@ -8684,7 +8635,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "perf_skia_bundled.isolate",
+      "isolate": "perf_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -8707,8 +8658,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Release",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Win-MSVC-x86_64-Release"
       ],
       "dimensions": [
         "gpu:8086:1926",
@@ -8734,7 +8684,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "perf_skia_bundled.isolate",
+      "isolate": "perf_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -8757,8 +8707,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Release-ANGLE",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Win-MSVC-x86_64-Release-ANGLE"
       ],
       "dimensions": [
         "gpu:8086:1926",
@@ -8784,7 +8733,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "perf_skia_bundled.isolate",
+      "isolate": "perf_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -8807,8 +8756,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Release-Vulkan",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Win-MSVC-x86_64-Release-Vulkan"
       ],
       "dimensions": [
         "gpu:8086:1926",
@@ -8834,7 +8782,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "perf_skia_bundled.isolate",
+      "isolate": "perf_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -8857,8 +8805,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Win-MSVC-x86_64-Debug"
       ],
       "dimensions": [
         "gpu:10de:1401",
@@ -8885,7 +8832,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "perf_skia_bundled.isolate",
+      "isolate": "perf_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -8908,8 +8855,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Release",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Win-MSVC-x86_64-Release"
       ],
       "dimensions": [
         "gpu:10de:1401",
@@ -8936,7 +8882,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "perf_skia_bundled.isolate",
+      "isolate": "perf_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -8959,8 +8905,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Win-MSVC-x86_64-Debug"
       ],
       "dimensions": [
         "gpu:1002:683d",
@@ -8986,7 +8931,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "perf_skia_bundled.isolate",
+      "isolate": "perf_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -9009,8 +8954,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Release",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Win-MSVC-x86_64-Release"
       ],
       "dimensions": [
         "gpu:1002:683d",
@@ -9036,7 +8980,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "perf_skia_bundled.isolate",
+      "isolate": "perf_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -9059,8 +9003,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Win-MSVC-x86_64-Debug"
       ],
       "dimensions": [
         "gpu:10de:11c0",
@@ -9086,7 +9029,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "perf_skia_bundled.isolate",
+      "isolate": "perf_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -9109,8 +9052,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug-Vulkan",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Win-MSVC-x86_64-Debug-Vulkan"
       ],
       "dimensions": [
         "gpu:10de:11c0",
@@ -9136,7 +9078,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "perf_skia_bundled.isolate",
+      "isolate": "perf_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -9159,8 +9101,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Release",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Win-MSVC-x86_64-Release"
       ],
       "dimensions": [
         "gpu:10de:11c0",
@@ -9186,7 +9127,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "perf_skia_bundled.isolate",
+      "isolate": "perf_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -9209,8 +9150,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Release-Vulkan",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Win-MSVC-x86_64-Release-Vulkan"
       ],
       "dimensions": [
         "gpu:10de:11c0",
@@ -9236,7 +9176,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "perf_skia_bundled.isolate",
+      "isolate": "perf_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -9259,8 +9199,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Win-MSVC-x86_64-Debug"
       ],
       "dimensions": [
         "gpu:8086:0412",
@@ -9286,7 +9225,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "perf_skia_bundled.isolate",
+      "isolate": "perf_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -9309,8 +9248,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Release",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Win-MSVC-x86_64-Release"
       ],
       "dimensions": [
         "gpu:8086:0412",
@@ -9336,7 +9274,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "perf_skia_bundled.isolate",
+      "isolate": "perf_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -9359,8 +9297,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Win-MSVC-x86_64-Debug"
       ],
       "dimensions": [
         "gpu:10de:1401",
@@ -9387,7 +9324,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "perf_skia_bundled.isolate",
+      "isolate": "perf_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -9410,8 +9347,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug-ANGLE",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Win-MSVC-x86_64-Debug-ANGLE"
       ],
       "dimensions": [
         "gpu:10de:1401",
@@ -9438,7 +9374,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "perf_skia_bundled.isolate",
+      "isolate": "perf_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -9461,8 +9397,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Release",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Win-MSVC-x86_64-Release"
       ],
       "dimensions": [
         "gpu:10de:1401",
@@ -9489,7 +9424,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "perf_skia_bundled.isolate",
+      "isolate": "perf_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -9512,8 +9447,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Release-ANGLE",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Win-MSVC-x86_64-Release-ANGLE"
       ],
       "dimensions": [
         "gpu:10de:1401",
@@ -9540,7 +9474,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "perf_skia_bundled.isolate",
+      "isolate": "perf_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -9563,8 +9497,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Win-MSVC-x86_64-Debug"
       ],
       "dimensions": [
         "gpu:10de:1ba1",
@@ -9590,7 +9523,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "perf_skia_bundled.isolate",
+      "isolate": "perf_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -9613,8 +9546,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug-ANGLE",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Win-MSVC-x86_64-Debug-ANGLE"
       ],
       "dimensions": [
         "gpu:10de:1ba1",
@@ -9640,7 +9572,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "perf_skia_bundled.isolate",
+      "isolate": "perf_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -9663,8 +9595,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug-Vulkan",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Win-MSVC-x86_64-Debug-Vulkan"
       ],
       "dimensions": [
         "gpu:10de:1ba1",
@@ -9690,7 +9621,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "perf_skia_bundled.isolate",
+      "isolate": "perf_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -9713,8 +9644,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Release",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Win-MSVC-x86_64-Release"
       ],
       "dimensions": [
         "gpu:10de:1ba1",
@@ -9740,7 +9670,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "perf_skia_bundled.isolate",
+      "isolate": "perf_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -9763,8 +9693,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Release-ANGLE",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Win-MSVC-x86_64-Release-ANGLE"
       ],
       "dimensions": [
         "gpu:10de:1ba1",
@@ -9790,7 +9719,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "perf_skia_bundled.isolate",
+      "isolate": "perf_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -9813,8 +9742,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Release-Vulkan",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Win-MSVC-x86_64-Release-Vulkan"
       ],
       "dimensions": [
         "gpu:10de:1ba1",
@@ -9840,7 +9768,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "perf_skia_bundled.isolate",
+      "isolate": "perf_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -9863,8 +9791,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86-Debug",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Win-MSVC-x86-Debug"
       ],
       "dimensions": [
         "cpu:x86-64",
@@ -9891,7 +9818,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "perf_skia_bundled.isolate",
+      "isolate": "perf_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -9914,8 +9841,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Win-MSVC-x86_64-Debug"
       ],
       "dimensions": [
         "cpu:x86-64",
@@ -9942,7 +9868,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "perf_skia_bundled.isolate",
+      "isolate": "perf_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -9965,8 +9891,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug-GDI",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Win-MSVC-x86_64-Debug-GDI"
       ],
       "dimensions": [
         "cpu:x86-64",
@@ -9993,7 +9918,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "perf_skia_bundled.isolate",
+      "isolate": "perf_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -10016,8 +9941,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Release",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Win-MSVC-x86_64-Release"
       ],
       "dimensions": [
         "cpu:x86-64",
@@ -10044,7 +9968,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "perf_skia_bundled.isolate",
+      "isolate": "perf_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -10067,8 +9991,7 @@
         }
       ],
       "dependencies": [
-        "Build-Mac-Clang-arm64-Debug-iOS",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Mac-Clang-arm64-Debug-iOS"
       ],
       "dimensions": [
         "device:iPad5,1",
@@ -10094,7 +10017,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "perf_skia_bundled.isolate",
+      "isolate": "perf_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -10117,8 +10040,7 @@
         }
       ],
       "dependencies": [
-        "Build-Mac-Clang-arm64-Release-iOS",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Mac-Clang-arm64-Release-iOS"
       ],
       "dimensions": [
         "device:iPad5,1",
@@ -10144,7 +10066,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "perf_skia_bundled.isolate",
+      "isolate": "perf_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -12105,8 +12027,7 @@
         }
       ],
       "dependencies": [
-        "Build-Mac-Clang-x86_64-Debug",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Mac-Clang-x86_64-Debug"
       ],
       "dimensions": [
         "gpu:10de:08a4",
@@ -12132,7 +12053,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia_bundled.isolate",
+      "isolate": "test_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -12155,8 +12076,7 @@
         }
       ],
       "dependencies": [
-        "Build-Mac-Clang-x86_64-Release",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Mac-Clang-x86_64-Release"
       ],
       "dimensions": [
         "gpu:10de:08a4",
@@ -12182,7 +12102,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia_bundled.isolate",
+      "isolate": "test_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -12205,8 +12125,7 @@
         }
       ],
       "dependencies": [
-        "Build-Mac-Clang-x86_64-Debug",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Mac-Clang-x86_64-Debug"
       ],
       "dimensions": [
         "cpu:x86-64",
@@ -12233,7 +12152,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia_bundled.isolate",
+      "isolate": "test_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -12256,8 +12175,7 @@
         }
       ],
       "dependencies": [
-        "Build-Mac-Clang-x86_64-Release",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Mac-Clang-x86_64-Release"
       ],
       "dimensions": [
         "cpu:x86-64",
@@ -12284,7 +12202,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia_bundled.isolate",
+      "isolate": "test_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -12307,8 +12225,7 @@
         }
       ],
       "dependencies": [
-        "Build-Mac-Clang-x86_64-Debug",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Mac-Clang-x86_64-Debug"
       ],
       "dimensions": [
         "gpu:8086:0a2e",
@@ -12334,7 +12251,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia_bundled.isolate",
+      "isolate": "test_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -12357,8 +12274,7 @@
         }
       ],
       "dependencies": [
-        "Build-Mac-Clang-x86_64-Debug-CommandBuffer",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Mac-Clang-x86_64-Debug-CommandBuffer"
       ],
       "dimensions": [
         "gpu:8086:0a2e",
@@ -12384,7 +12300,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia_bundled.isolate",
+      "isolate": "test_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -12407,8 +12323,7 @@
         }
       ],
       "dependencies": [
-        "Build-Mac-Clang-x86_64-Release",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Mac-Clang-x86_64-Release"
       ],
       "dimensions": [
         "gpu:8086:0a2e",
@@ -12434,7 +12349,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia_bundled.isolate",
+      "isolate": "test_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -12457,8 +12372,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86_64-Debug",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Ubuntu-Clang-x86_64-Debug"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -12485,7 +12399,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia_bundled.isolate",
+      "isolate": "test_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -12513,8 +12427,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86_64-Debug-ASAN",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Ubuntu-Clang-x86_64-Debug-ASAN"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -12541,7 +12454,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia_bundled.isolate",
+      "isolate": "test_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -12569,8 +12482,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86_64-Debug-MSAN",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Ubuntu-Clang-x86_64-Debug-MSAN"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -12597,7 +12509,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia_bundled.isolate",
+      "isolate": "test_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -12620,8 +12532,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86_64-Release",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Ubuntu-Clang-x86_64-Release"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -12648,7 +12559,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia_bundled.isolate",
+      "isolate": "test_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -12676,8 +12587,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86_64-Release-ASAN",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Ubuntu-Clang-x86_64-Release-ASAN"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -12704,7 +12614,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia_bundled.isolate",
+      "isolate": "test_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -12727,8 +12637,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86_64-Release-Fast",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Ubuntu-Clang-x86_64-Release-Fast"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -12755,7 +12664,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia_bundled.isolate",
+      "isolate": "test_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -12783,8 +12692,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86_64-Release-TSAN",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Ubuntu-Clang-x86_64-Release-TSAN"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -12811,7 +12719,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia_bundled.isolate",
+      "isolate": "test_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -12839,8 +12747,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86_64-Debug-ASAN",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Ubuntu-Clang-x86_64-Debug-ASAN"
       ],
       "dimensions": [
         "gpu:10de:104a",
@@ -12866,7 +12773,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia_bundled.isolate",
+      "isolate": "test_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -12894,8 +12801,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86_64-Release-ASAN",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Ubuntu-Clang-x86_64-Release-ASAN"
       ],
       "dimensions": [
         "gpu:10de:104a",
@@ -12921,7 +12827,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia_bundled.isolate",
+      "isolate": "test_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -12949,8 +12855,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86_64-Release-TSAN",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Ubuntu-Clang-x86_64-Release-TSAN"
       ],
       "dimensions": [
         "gpu:10de:104a",
@@ -12976,7 +12881,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia_bundled.isolate",
+      "isolate": "test_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -12999,8 +12904,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-GCC-x86-Debug",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Ubuntu-GCC-x86-Debug"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -13027,7 +12931,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia_bundled.isolate",
+      "isolate": "test_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -13050,8 +12954,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-GCC-x86_64-Debug",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Ubuntu-GCC-x86_64-Debug"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -13078,7 +12981,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia_bundled.isolate",
+      "isolate": "test_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -13176,8 +13079,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-GCC-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Ubuntu-GCC-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -13204,7 +13106,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia_bundled.isolate",
+      "isolate": "test_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -13227,8 +13129,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-GCC-x86_64-Release",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Ubuntu-GCC-x86_64-Release"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -13255,7 +13156,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia_bundled.isolate",
+      "isolate": "test_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -13278,8 +13179,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-GCC-x86_64-Release-SKNX_NO_SIMD",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Ubuntu-GCC-x86_64-Release-SKNX_NO_SIMD"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -13306,7 +13206,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia_bundled.isolate",
+      "isolate": "test_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -13329,8 +13229,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-GCC-x86_64-Release",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Ubuntu-GCC-x86_64-Release"
       ],
       "dimensions": [
         "gpu:10de:1244",
@@ -13356,7 +13255,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 3600000000000,
-      "isolate": "test_skia_bundled.isolate",
+      "isolate": "test_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -13379,8 +13278,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-GCC-x86_64-Release",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Ubuntu-GCC-x86_64-Release"
       ],
       "dimensions": [
         "gpu:10de:1244",
@@ -13406,7 +13304,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 3600000000000,
-      "isolate": "test_skia_bundled.isolate",
+      "isolate": "test_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -13429,8 +13327,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-GCC-x86_64-Release",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Ubuntu-GCC-x86_64-Release"
       ],
       "dimensions": [
         "gpu:10de:1244",
@@ -13456,7 +13353,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 3600000000000,
-      "isolate": "test_skia_bundled.isolate",
+      "isolate": "test_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -13479,8 +13376,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-GCC-x86_64-Debug",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Ubuntu-GCC-x86_64-Debug"
       ],
       "dimensions": [
         "gpu:10de:11c0",
@@ -13506,7 +13402,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia_bundled.isolate",
+      "isolate": "test_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -13529,8 +13425,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-GCC-x86_64-Release",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Ubuntu-GCC-x86_64-Release"
       ],
       "dimensions": [
         "gpu:10de:11c0",
@@ -13556,7 +13451,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia_bundled.isolate",
+      "isolate": "test_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -13579,8 +13474,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-GCC-x86_64-Debug",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Ubuntu-GCC-x86_64-Debug"
       ],
       "dimensions": [
         "gpu:10de:1401",
@@ -13606,7 +13500,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia_bundled.isolate",
+      "isolate": "test_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -13629,8 +13523,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-GCC-x86_64-Release",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Ubuntu-GCC-x86_64-Release"
       ],
       "dimensions": [
         "gpu:10de:1401",
@@ -13656,7 +13549,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia_bundled.isolate",
+      "isolate": "test_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -13684,8 +13577,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86_64-Debug",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Ubuntu-Clang-x86_64-Debug"
       ],
       "dimensions": [
         "gpu:8086:22b1",
@@ -13711,7 +13603,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia_bundled.isolate",
+      "isolate": "test_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -13739,8 +13631,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86_64-Release",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Ubuntu-Clang-x86_64-Release"
       ],
       "dimensions": [
         "gpu:8086:22b1",
@@ -13766,7 +13657,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia_bundled.isolate",
+      "isolate": "test_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -13794,8 +13685,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86_64-Debug",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Ubuntu-Clang-x86_64-Debug"
       ],
       "dimensions": [
         "gpu:8086:1926",
@@ -13821,7 +13711,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia_bundled.isolate",
+      "isolate": "test_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -13854,8 +13744,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86_64-Debug-Vulkan",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Ubuntu-Clang-x86_64-Debug-Vulkan"
       ],
       "dimensions": [
         "gpu:8086:1926",
@@ -13881,7 +13770,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia_bundled.isolate",
+      "isolate": "test_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -13909,8 +13798,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86_64-Release",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Ubuntu-Clang-x86_64-Release"
       ],
       "dimensions": [
         "gpu:8086:1926",
@@ -13936,7 +13824,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia_bundled.isolate",
+      "isolate": "test_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -13969,8 +13857,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86_64-Release-Vulkan",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Ubuntu-Clang-x86_64-Release-Vulkan"
       ],
       "dimensions": [
         "gpu:8086:1926",
@@ -13996,7 +13883,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia_bundled.isolate",
+      "isolate": "test_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -14024,8 +13911,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86_64-Debug",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Ubuntu-Clang-x86_64-Debug"
       ],
       "dimensions": [
         "gpu:8086:0f31",
@@ -14051,7 +13937,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia_bundled.isolate",
+      "isolate": "test_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -14079,8 +13965,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86_64-Release",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Ubuntu-Clang-x86_64-Release"
       ],
       "dimensions": [
         "gpu:8086:0f31",
@@ -14106,7 +13991,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia_bundled.isolate",
+      "isolate": "test_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -14134,8 +14019,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86_64-Debug",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Ubuntu-Clang-x86_64-Debug"
       ],
       "dimensions": [
         "gpu:8086:0102",
@@ -14161,7 +14045,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia_bundled.isolate",
+      "isolate": "test_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -14189,8 +14073,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86_64-Release",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Ubuntu-Clang-x86_64-Release"
       ],
       "dimensions": [
         "gpu:8086:0102",
@@ -14216,7 +14099,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia_bundled.isolate",
+      "isolate": "test_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -14239,8 +14122,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Win-MSVC-x86_64-Debug"
       ],
       "dimensions": [
         "gpu:1002:6646",
@@ -14266,7 +14148,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia_bundled.isolate",
+      "isolate": "test_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -14289,8 +14171,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug-ANGLE",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Win-MSVC-x86_64-Debug-ANGLE"
       ],
       "dimensions": [
         "gpu:1002:6646",
@@ -14316,7 +14197,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia_bundled.isolate",
+      "isolate": "test_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -14339,8 +14220,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug-Vulkan",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Win-MSVC-x86_64-Debug-Vulkan"
       ],
       "dimensions": [
         "gpu:1002:6646",
@@ -14366,7 +14246,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia_bundled.isolate",
+      "isolate": "test_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -14389,8 +14269,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Release",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Win-MSVC-x86_64-Release"
       ],
       "dimensions": [
         "gpu:1002:6646",
@@ -14416,7 +14295,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia_bundled.isolate",
+      "isolate": "test_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -14439,8 +14318,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Release-ANGLE",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Win-MSVC-x86_64-Release-ANGLE"
       ],
       "dimensions": [
         "gpu:1002:6646",
@@ -14466,7 +14344,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia_bundled.isolate",
+      "isolate": "test_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -14489,8 +14367,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Release-Vulkan",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Win-MSVC-x86_64-Release-Vulkan"
       ],
       "dimensions": [
         "gpu:1002:6646",
@@ -14516,7 +14393,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia_bundled.isolate",
+      "isolate": "test_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -14539,8 +14416,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Release",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Win-MSVC-x86_64-Release"
       ],
       "dimensions": [
         "gpu:10de:104a",
@@ -14566,7 +14442,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia_bundled.isolate",
+      "isolate": "test_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -14589,8 +14465,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug-ANGLE",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Win-MSVC-x86_64-Debug-ANGLE"
       ],
       "dimensions": [
         "gpu:8086:162b",
@@ -14616,7 +14491,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia_bundled.isolate",
+      "isolate": "test_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -14639,8 +14514,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Release-ANGLE",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Win-MSVC-x86_64-Release-ANGLE"
       ],
       "dimensions": [
         "gpu:8086:162b",
@@ -14666,7 +14540,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia_bundled.isolate",
+      "isolate": "test_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -14689,8 +14563,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Win-MSVC-x86_64-Debug"
       ],
       "dimensions": [
         "gpu:8086:1926",
@@ -14716,7 +14589,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia_bundled.isolate",
+      "isolate": "test_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -14739,8 +14612,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug-ANGLE",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Win-MSVC-x86_64-Debug-ANGLE"
       ],
       "dimensions": [
         "gpu:8086:1926",
@@ -14766,7 +14638,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia_bundled.isolate",
+      "isolate": "test_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -14789,8 +14661,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug-Vulkan",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Win-MSVC-x86_64-Debug-Vulkan"
       ],
       "dimensions": [
         "gpu:8086:1926",
@@ -14816,7 +14687,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia_bundled.isolate",
+      "isolate": "test_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -14839,8 +14710,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Release",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Win-MSVC-x86_64-Release"
       ],
       "dimensions": [
         "gpu:8086:1926",
@@ -14866,7 +14736,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia_bundled.isolate",
+      "isolate": "test_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -14889,8 +14759,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Release-ANGLE",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Win-MSVC-x86_64-Release-ANGLE"
       ],
       "dimensions": [
         "gpu:8086:1926",
@@ -14916,7 +14785,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia_bundled.isolate",
+      "isolate": "test_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -14939,8 +14808,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Release-Vulkan",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Win-MSVC-x86_64-Release-Vulkan"
       ],
       "dimensions": [
         "gpu:8086:1926",
@@ -14966,7 +14834,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia_bundled.isolate",
+      "isolate": "test_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -14989,8 +14857,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Win-MSVC-x86_64-Debug"
       ],
       "dimensions": [
         "gpu:10de:1401",
@@ -15017,7 +14884,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia_bundled.isolate",
+      "isolate": "test_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -15040,8 +14907,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Release",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Win-MSVC-x86_64-Release"
       ],
       "dimensions": [
         "gpu:10de:1401",
@@ -15068,7 +14934,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia_bundled.isolate",
+      "isolate": "test_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -15091,8 +14957,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Win-MSVC-x86_64-Debug"
       ],
       "dimensions": [
         "gpu:1002:683d",
@@ -15118,7 +14983,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia_bundled.isolate",
+      "isolate": "test_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -15141,8 +15006,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Release",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Win-MSVC-x86_64-Release"
       ],
       "dimensions": [
         "gpu:1002:683d",
@@ -15168,7 +15032,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia_bundled.isolate",
+      "isolate": "test_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -15191,8 +15055,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Win-MSVC-x86_64-Debug"
       ],
       "dimensions": [
         "gpu:10de:11c0",
@@ -15218,7 +15081,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia_bundled.isolate",
+      "isolate": "test_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -15241,8 +15104,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug-Vulkan",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Win-MSVC-x86_64-Debug-Vulkan"
       ],
       "dimensions": [
         "gpu:10de:11c0",
@@ -15268,7 +15130,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia_bundled.isolate",
+      "isolate": "test_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -15291,8 +15153,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Release",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Win-MSVC-x86_64-Release"
       ],
       "dimensions": [
         "gpu:10de:11c0",
@@ -15318,7 +15179,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia_bundled.isolate",
+      "isolate": "test_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -15341,8 +15202,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Win-MSVC-x86_64-Debug"
       ],
       "dimensions": [
         "gpu:8086:0412",
@@ -15368,7 +15228,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia_bundled.isolate",
+      "isolate": "test_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -15391,8 +15251,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Release",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Win-MSVC-x86_64-Release"
       ],
       "dimensions": [
         "gpu:8086:0412",
@@ -15418,7 +15277,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia_bundled.isolate",
+      "isolate": "test_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -15441,8 +15300,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Win-MSVC-x86_64-Debug"
       ],
       "dimensions": [
         "gpu:10de:1401",
@@ -15469,7 +15327,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia_bundled.isolate",
+      "isolate": "test_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -15492,8 +15350,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug-ANGLE",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Win-MSVC-x86_64-Debug-ANGLE"
       ],
       "dimensions": [
         "gpu:10de:1401",
@@ -15520,7 +15377,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia_bundled.isolate",
+      "isolate": "test_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -15543,8 +15400,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Release",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Win-MSVC-x86_64-Release"
       ],
       "dimensions": [
         "gpu:10de:1401",
@@ -15571,7 +15427,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia_bundled.isolate",
+      "isolate": "test_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -15594,8 +15450,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Release-ANGLE",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Win-MSVC-x86_64-Release-ANGLE"
       ],
       "dimensions": [
         "gpu:10de:1401",
@@ -15622,7 +15477,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia_bundled.isolate",
+      "isolate": "test_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -15645,8 +15500,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Win-MSVC-x86_64-Debug"
       ],
       "dimensions": [
         "gpu:10de:1ba1",
@@ -15672,7 +15526,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia_bundled.isolate",
+      "isolate": "test_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -15695,8 +15549,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug-ANGLE",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Win-MSVC-x86_64-Debug-ANGLE"
       ],
       "dimensions": [
         "gpu:10de:1ba1",
@@ -15722,7 +15575,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia_bundled.isolate",
+      "isolate": "test_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -15745,8 +15598,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug-Vulkan",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Win-MSVC-x86_64-Debug-Vulkan"
       ],
       "dimensions": [
         "gpu:10de:1ba1",
@@ -15772,7 +15624,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia_bundled.isolate",
+      "isolate": "test_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -15795,8 +15647,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Release",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Win-MSVC-x86_64-Release"
       ],
       "dimensions": [
         "gpu:10de:1ba1",
@@ -15822,7 +15673,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia_bundled.isolate",
+      "isolate": "test_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -15845,8 +15696,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Release-ANGLE",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Win-MSVC-x86_64-Release-ANGLE"
       ],
       "dimensions": [
         "gpu:10de:1ba1",
@@ -15872,7 +15722,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia_bundled.isolate",
+      "isolate": "test_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -15895,8 +15745,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Release-Vulkan",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Win-MSVC-x86_64-Release-Vulkan"
       ],
       "dimensions": [
         "gpu:10de:1ba1",
@@ -15922,7 +15771,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia_bundled.isolate",
+      "isolate": "test_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -15945,8 +15794,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86-Debug",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Win-MSVC-x86-Debug"
       ],
       "dimensions": [
         "cpu:x86-64",
@@ -15973,7 +15821,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia_bundled.isolate",
+      "isolate": "test_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -15996,8 +15844,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86-Release",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Win-MSVC-x86-Release"
       ],
       "dimensions": [
         "cpu:x86-64",
@@ -16024,7 +15871,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia_bundled.isolate",
+      "isolate": "test_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -16047,8 +15894,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Win-MSVC-x86_64-Debug"
       ],
       "dimensions": [
         "cpu:x86-64",
@@ -16075,7 +15921,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia_bundled.isolate",
+      "isolate": "test_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -16098,8 +15944,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug-GDI",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Win-MSVC-x86_64-Debug-GDI"
       ],
       "dimensions": [
         "cpu:x86-64",
@@ -16126,7 +15971,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia_bundled.isolate",
+      "isolate": "test_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -16149,8 +15994,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Release",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Win-MSVC-x86_64-Release"
       ],
       "dimensions": [
         "cpu:x86-64",
@@ -16177,7 +16021,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia_bundled.isolate",
+      "isolate": "test_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -16200,8 +16044,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Release-GDI",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Win-MSVC-x86_64-Release-GDI"
       ],
       "dimensions": [
         "cpu:x86-64",
@@ -16228,7 +16071,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia_bundled.isolate",
+      "isolate": "test_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -16251,8 +16094,7 @@
         }
       ],
       "dependencies": [
-        "Build-Mac-Clang-arm64-Debug-iOS",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Mac-Clang-arm64-Debug-iOS"
       ],
       "dimensions": [
         "device:iPad5,1",
@@ -16278,7 +16120,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia_bundled.isolate",
+      "isolate": "test_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
@@ -16301,8 +16143,7 @@
         }
       ],
       "dependencies": [
-        "Build-Mac-Clang-arm64-Release-iOS",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Mac-Clang-arm64-Release-iOS"
       ],
       "dimensions": [
         "device:iPad5,1",
@@ -16328,7 +16169,7 @@
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia_bundled.isolate",
+      "isolate": "test_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },