diff --git a/README.recipes.md b/README.recipes.md
index 06d7f6e..efeb746 100644
--- a/README.recipes.md
+++ b/README.recipes.md
@@ -178,37 +178,37 @@
 
 [DEPS](/recipes/dart/flutter_engine.py#17): [build/goma][build/recipe_modules/goma], [bisect\_build](#recipe_modules-bisect_build), [dart](#recipe_modules-dart), [depot\_tools/bot\_update][depot_tools/recipe_modules/bot_update], [depot\_tools/depot\_tools][depot_tools/recipe_modules/depot_tools], [depot\_tools/gclient][depot_tools/recipe_modules/gclient], [depot\_tools/gitiles][depot_tools/recipe_modules/gitiles], [recipe\_engine/buildbucket][recipe_engine/recipe_modules/buildbucket], [recipe\_engine/context][recipe_engine/recipe_modules/context], [recipe\_engine/file][recipe_engine/recipe_modules/file], [recipe\_engine/json][recipe_engine/recipe_modules/json], [recipe\_engine/path][recipe_engine/recipe_modules/path], [recipe\_engine/platform][recipe_engine/recipe_modules/platform], [recipe\_engine/properties][recipe_engine/recipe_modules/properties], [recipe\_engine/python][recipe_engine/recipe_modules/python], [recipe\_engine/runtime][recipe_engine/recipe_modules/runtime], [recipe\_engine/step][recipe_engine/recipe_modules/step]
 
-&mdash; **def [AnalyzeDartUI](/recipes/dart/flutter_engine.py#75)(api, checkout_dir):**
+&mdash; **def [AnalyzeDartUI](/recipes/dart/flutter_engine.py#75)(api, engine_src):**
 
-&mdash; **def [Build](/recipes/dart/flutter_engine.py#58)(api, checkout_dir, config, \*targets):**
+&mdash; **def [Build](/recipes/dart/flutter_engine.py#58)(api, engine_src, config, \*targets):**
 
-&mdash; **def [BuildAndTest](/recipes/dart/flutter_engine.py#376)(api, start_dir, checkout_dir, flutter_rev):**
+&mdash; **def [BuildAndTest](/recipes/dart/flutter_engine.py#382)(api, start_dir, engine_src, flutter_rev):**
 
-&mdash; **def [BuildLinux](/recipes/dart/flutter_engine.py#108)(api, checkout_dir):**
+&mdash; **def [BuildLinux](/recipes/dart/flutter_engine.py#108)(api, engine_src):**
 
-&mdash; **def [BuildLinuxAndroidArm](/recipes/dart/flutter_engine.py#92)(api, checkout_dir):**
+&mdash; **def [BuildLinuxAndroidArm](/recipes/dart/flutter_engine.py#92)(api, engine_src):**
 
-&mdash; **def [BuildLinuxAndroidx86](/recipes/dart/flutter_engine.py#85)(api, checkout_dir):**
+&mdash; **def [BuildLinuxAndroidx86](/recipes/dart/flutter_engine.py#85)(api, engine_src):**
 
-&mdash; **def [CopyArtifacts](/recipes/dart/flutter_engine.py#184)(api, engine_src, cached_dest, file_paths):**
+&mdash; **def [CopyArtifacts](/recipes/dart/flutter_engine.py#189)(api, engine_src, cached_dest, file_paths):**
 
-&mdash; **def [GetCheckout](/recipes/dart/flutter_engine.py#135)(api):**
+&mdash; **def [GetCheckout](/recipes/dart/flutter_engine.py#135)(api, start_dir, engine_src):**
 
-&mdash; **def [KillTasks](/recipes/dart/flutter_engine.py#50)(api, checkout_dir, ok_ret='any'):**
+&mdash; **def [KillTasks](/recipes/dart/flutter_engine.py#50)(api, engine_src, ok_ret='any'):**
 
 Kills leftover tasks from previous runs or steps.
 
-&mdash; **def [RunGN](/recipes/dart/flutter_engine.py#67)(api, checkout_dir, \*args):**
+&mdash; **def [RunGN](/recipes/dart/flutter_engine.py#67)(api, engine_src, \*args):**
 
-&mdash; **def [RunSteps](/recipes/dart/flutter_engine.py#346)(api):**
+&mdash; **def [RunSteps](/recipes/dart/flutter_engine.py#350)(api):**
 
-&mdash; **def [TestEngine](/recipes/dart/flutter_engine.py#80)(api, checkout_dir):**
+&mdash; **def [TestEngine](/recipes/dart/flutter_engine.py#80)(api, engine_src):**
 
-&mdash; **def [TestFlutter](/recipes/dart/flutter_engine.py#272)(api, start_dir, just_built_dart_sdk):**
+&mdash; **def [TestFlutter](/recipes/dart/flutter_engine.py#277)(api, start_dir, engine_src, just_built_dart_sdk):**
 
-&mdash; **def [TestObservatory](/recipes/dart/flutter_engine.py#124)(api, checkout_dir):**
+&mdash; **def [TestObservatory](/recipes/dart/flutter_engine.py#124)(api, engine_src):**
 
-&mdash; **def [UpdateCachedEngineArtifacts](/recipes/dart/flutter_engine.py#197)(api, flutter, engine_src):**
+&mdash; **def [UpdateCachedEngineArtifacts](/recipes/dart/flutter_engine.py#202)(api, flutter, engine_src):**
 ### *recipes* / [dart/forward\_branch](/recipes/dart/forward_branch.py)
 
 [DEPS](/recipes/dart/forward_branch.py#8): [dart](#recipe_modules-dart), [depot\_tools/git][depot_tools/recipe_modules/git], [recipe\_engine/buildbucket][recipe_engine/recipe_modules/buildbucket], [recipe\_engine/path][recipe_engine/recipe_modules/path], [recipe\_engine/properties][recipe_engine/recipe_modules/properties], [recipe\_engine/raw\_io][recipe_engine/recipe_modules/raw_io], [recipe\_engine/step][recipe_engine/recipe_modules/step]
diff --git a/recipes/dart/flutter_engine.expected/flutter-engine-linux.json b/recipes/dart/flutter_engine.expected/flutter-engine-linux.json
index ef0337e..21b0c47 100644
--- a/recipes/dart/flutter_engine.expected/flutter-engine-linux.json
+++ b/recipes/dart/flutter_engine.expected/flutter-engine-linux.json
@@ -9,12 +9,26 @@
       "rmcontents",
       "[CACHE]/builder"
     ],
-    "cwd": "[CACHE]/builder",
     "infra_step": true,
     "name": "everything"
   },
   {
     "cmd": [
+      "vpython",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "ensure-directory",
+      "--mode",
+      "0777",
+      "[CACHE]/builder/engine"
+    ],
+    "infra_step": true,
+    "name": "mkdir engine"
+  },
+  {
+    "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[depot_tools::gitiles]/resources/gerrit_client.py",
@@ -25,7 +39,7 @@
       "--format",
       "text"
     ],
-    "cwd": "[CACHE]/builder",
+    "cwd": "[CACHE]/builder/engine",
     "name": "fetch ffffffff:commits.json"
   },
   {
@@ -34,7 +48,7 @@
       "-u",
       "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
       "--spec-path",
-      "cache_dir = '[CACHE]/git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'src/flutter', 'url': 'https://dart.googlesource.com/external/github.com/flutter/engine'}, {'deps_file': '.DEPS.git', 'managed': True, 'name': 'flutter', 'url': 'https://dart.googlesource.com/external/github.com/flutter/flutter'}]\ntarget_os = ['android']",
+      "cache_dir = '[CACHE]/git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'src/flutter', 'url': 'https://dart.googlesource.com/external/github.com/flutter/engine'}, {'deps_file': '.DEPS.git', 'managed': True, 'name': '../flutter', 'url': 'https://dart.googlesource.com/external/github.com/flutter/flutter'}]\ntarget_os = ['android']",
       "--revision_mapping_file",
       "{}",
       "--git-cache-dir",
@@ -44,13 +58,13 @@
       "--output_json",
       "/path/to/tmp/json",
       "--revision",
-      "flutter@HEAD",
+      "../flutter@HEAD",
       "--revision",
       "src/flutter@bar",
       "--revision",
       "src/third_party/dart@foo"
     ],
-    "cwd": "[CACHE]/builder",
+    "cwd": "[CACHE]/builder/engine",
     "env": {
       "GIT_HTTP_LOW_SPEED_LIMIT": "102400",
       "GIT_HTTP_LOW_SPEED_TIME": "300"
@@ -70,14 +84,14 @@
       "@@@STEP_LOG_LINE@json.output@{@@@",
       "@@@STEP_LOG_LINE@json.output@  \"did_run\": true, @@@",
       "@@@STEP_LOG_LINE@json.output@  \"fixed_revisions\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"flutter\": \"HEAD\", @@@",
+      "@@@STEP_LOG_LINE@json.output@    \"../flutter\": \"HEAD\", @@@",
       "@@@STEP_LOG_LINE@json.output@    \"src/flutter\": \"bar\", @@@",
       "@@@STEP_LOG_LINE@json.output@    \"src/third_party/dart\": \"foo\"@@@",
       "@@@STEP_LOG_LINE@json.output@  }, @@@",
       "@@@STEP_LOG_LINE@json.output@  \"manifest\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"flutter\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@      \"repository\": \"https://fake.org/flutter.git\", @@@",
-      "@@@STEP_LOG_LINE@json.output@      \"revision\": \"ff25d17873bba4bc564d8c7217280aa254ed4541\"@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"../flutter\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@      \"repository\": \"https://fake.org/../flutter.git\", @@@",
+      "@@@STEP_LOG_LINE@json.output@      \"revision\": \"ecd9a748968d17ba8524a1801b503f35c40a8f05\"@@@",
       "@@@STEP_LOG_LINE@json.output@    }, @@@",
       "@@@STEP_LOG_LINE@json.output@    \"src/flutter\": {@@@",
       "@@@STEP_LOG_LINE@json.output@      \"repository\": \"https://fake.org/src/flutter.git\", @@@",
@@ -94,10 +108,10 @@
       "@@@STEP_LOG_LINE@json.output@  \"root\": \"src/flutter\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"source_manifest\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"directories\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@      \"flutter\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@      \"../flutter\": {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"git_checkout\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@          \"repo_url\": \"https://fake.org/flutter.git\", @@@",
-      "@@@STEP_LOG_LINE@json.output@          \"revision\": \"ff25d17873bba4bc564d8c7217280aa254ed4541\"@@@",
+      "@@@STEP_LOG_LINE@json.output@          \"repo_url\": \"https://fake.org/../flutter.git\", @@@",
+      "@@@STEP_LOG_LINE@json.output@          \"revision\": \"ecd9a748968d17ba8524a1801b503f35c40a8f05\"@@@",
       "@@@STEP_LOG_LINE@json.output@        }@@@",
       "@@@STEP_LOG_LINE@json.output@      }, @@@",
       "@@@STEP_LOG_LINE@json.output@      \"src/flutter\": {@@@",
@@ -131,7 +145,7 @@
       "RECIPE_REPO[depot_tools]/gclient.py",
       "runhooks"
     ],
-    "cwd": "[CACHE]/builder",
+    "cwd": "[CACHE]/builder/engine",
     "env_suffixes": {
       "PATH": [
         "RECIPE_REPO[depot_tools]"
@@ -141,9 +155,35 @@
   },
   {
     "cmd": [
-      "src/third_party/dart/tools/3xhead_flutter_hooks.sh"
+      "vpython",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "symlink",
+      "[CACHE]/builder/flutter",
+      "[CACHE]/builder/engine/flutter"
     ],
-    "cwd": "[CACHE]/builder",
+    "cwd": "[CACHE]/builder/engine",
+    "env": {
+      "DEPOT_TOOLS_UPDATE": "0"
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "name": "symlink flutter to new checkout location"
+  },
+  {
+    "cmd": [
+      "[CACHE]/builder/engine/src/third_party/dart/tools/3xhead_flutter_hooks.sh"
+    ],
+    "cwd": "[CACHE]/builder/engine",
     "env": {
       "DEPOT_TOOLS_UPDATE": "0"
     },
@@ -225,7 +265,7 @@
     "cmd": [
       "python",
       "-u",
-      "[CACHE]/builder/src/third_party/dart/tools/task_kill.py"
+      "[CACHE]/builder/engine/src/third_party/dart/tools/task_kill.py"
     ],
     "name": "kill processes"
   },
@@ -238,20 +278,20 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "name": "accept android licenses"
   },
   {
     "cmd": [
-      "[CACHE]/builder/src/flutter/tools/gn",
+      "[CACHE]/builder/engine/src/flutter/tools/gn",
       "--full-dart-sdk"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "env_suffixes": {
@@ -283,7 +323,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "infra_step": true,
@@ -302,7 +342,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -347,7 +387,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "infra_step": true,
@@ -362,12 +402,12 @@
       "-j",
       "80",
       "-C",
-      "[CACHE]/builder/src/out/host_debug"
+      "[CACHE]/builder/engine/src/out/host_debug"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "name": "build host_debug"
@@ -387,7 +427,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -423,7 +463,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -448,7 +488,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -506,7 +546,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "name": "postprocess_for_goma.upload_log",
@@ -537,7 +577,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "infra_step": true,
@@ -565,7 +605,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "infra_step": true,
@@ -584,7 +624,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -629,7 +669,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "infra_step": true,
@@ -644,13 +684,13 @@
       "-j",
       "80",
       "-C",
-      "[CACHE]/builder/src/out/host_debug",
+      "[CACHE]/builder/engine/src/out/host_debug",
       "create_full_sdk"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "name": "build host_debug create_full_sdk"
@@ -670,7 +710,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -706,7 +746,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -731,7 +771,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -789,7 +829,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "name": "postprocess_for_goma (2).upload_log",
@@ -820,7 +860,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "infra_step": true,
@@ -831,13 +871,13 @@
   },
   {
     "cmd": [
-      "[CACHE]/builder/src/flutter/tools/gn",
+      "[CACHE]/builder/engine/src/flutter/tools/gn",
       "--unoptimized"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "env_suffixes": {
@@ -869,7 +909,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "infra_step": true,
@@ -888,7 +928,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -933,7 +973,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "infra_step": true,
@@ -948,12 +988,12 @@
       "-j",
       "80",
       "-C",
-      "[CACHE]/builder/src/out/host_debug_unopt"
+      "[CACHE]/builder/engine/src/out/host_debug_unopt"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "name": "build host_debug_unopt"
@@ -973,7 +1013,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -1009,7 +1049,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -1034,7 +1074,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -1092,7 +1132,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "name": "postprocess_for_goma (3).upload_log",
@@ -1123,7 +1163,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "infra_step": true,
@@ -1151,7 +1191,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "infra_step": true,
@@ -1170,7 +1210,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -1215,7 +1255,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "infra_step": true,
@@ -1230,13 +1270,13 @@
       "-j",
       "80",
       "-C",
-      "[CACHE]/builder/src/out/host_debug_unopt",
+      "[CACHE]/builder/engine/src/out/host_debug_unopt",
       "generate_dart_ui"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "name": "build host_debug_unopt generate_dart_ui"
@@ -1256,7 +1296,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -1292,7 +1332,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -1317,7 +1357,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -1375,7 +1415,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "name": "postprocess_for_goma (4).upload_log",
@@ -1406,7 +1446,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "infra_step": true,
@@ -1417,13 +1457,13 @@
   },
   {
     "cmd": [
-      "[CACHE]/builder/src/flutter/tools/gn",
+      "[CACHE]/builder/engine/src/flutter/tools/gn",
       "--runtime-mode=release"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "env_suffixes": {
@@ -1455,7 +1495,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "infra_step": true,
@@ -1474,7 +1514,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -1519,7 +1559,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "infra_step": true,
@@ -1534,12 +1574,12 @@
       "-j",
       "80",
       "-C",
-      "[CACHE]/builder/src/out/host_release"
+      "[CACHE]/builder/engine/src/out/host_release"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "name": "build host_release"
@@ -1559,7 +1599,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -1595,7 +1635,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -1620,7 +1660,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -1678,7 +1718,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "name": "postprocess_for_goma (5).upload_log",
@@ -1709,7 +1749,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "infra_step": true,
@@ -1720,7 +1760,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/builder/src/flutter/tools/gn",
+      "[CACHE]/builder/engine/src/flutter/tools/gn",
       "--fuchsia",
       "--fuchsia-cpu",
       "x64",
@@ -1730,7 +1770,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "env_suffixes": {
@@ -1762,7 +1802,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "infra_step": true,
@@ -1781,7 +1821,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -1826,7 +1866,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "infra_step": true,
@@ -1841,14 +1881,14 @@
       "-j",
       "80",
       "-C",
-      "[CACHE]/builder/src/out/fuchsia_debug_x64",
+      "[CACHE]/builder/engine/src/out/fuchsia_debug_x64",
       "flutter/shell/platform/fuchsia:fuchsia",
       "fuchsia_tests"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "name": "build fuchsia_debug_x64 flutter/shell/platform/fuchsia:fuchsia fuchsia_tests"
@@ -1868,7 +1908,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -1904,7 +1944,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -1929,7 +1969,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -1987,7 +2027,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "name": "postprocess_for_goma (6).upload_log",
@@ -2018,7 +2058,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "infra_step": true,
@@ -2037,12 +2077,12 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/builder/src/flutter/third_party/browsers/chrome"
+      "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "infra_step": true,
@@ -2053,7 +2093,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/builder/src/flutter/third_party/browsers/chrome",
+      "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome",
       "-ensure-file",
       "dart/browsers/chrome/${platform} version:84",
       "-max-threads",
@@ -2064,7 +2104,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "name": "ensure_installed",
@@ -2087,12 +2127,12 @@
       "/bin/bash",
       "flutter/ci/analyze.sh"
     ],
-    "cwd": "[CACHE]/builder/src",
+    "cwd": "[CACHE]/builder/engine/src",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "env_suffixes": {
       "DEPOT_TOOLS_UPDATE": [
@@ -2109,12 +2149,12 @@
       "/bin/bash",
       "flutter/testing/run_tests.sh"
     ],
-    "cwd": "[CACHE]/builder/src",
+    "cwd": "[CACHE]/builder/engine/src",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "env_suffixes": {
       "DEPOT_TOOLS_UPDATE": [
@@ -2129,32 +2169,32 @@
   {
     "cmd": [
       "dart",
-      "[CACHE]/builder/src/flutter/shell/testing/observatory/test.dart",
-      "[CACHE]/builder/src/out/host_debug/flutter_tester",
-      "[CACHE]/builder/src/flutter/shell/testing/observatory/empty_main.dart"
+      "[CACHE]/builder/engine/src/flutter/shell/testing/observatory/test.dart",
+      "[CACHE]/builder/engine/src/out/host_debug/flutter_tester",
+      "[CACHE]/builder/engine/src/flutter/shell/testing/observatory/empty_main.dart"
     ],
-    "cwd": "[CACHE]/builder/src",
+    "cwd": "[CACHE]/builder/engine/src",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "test observatory and service protocol",
     "timeout": 300
   },
   {
     "cmd": [
-      "[CACHE]/builder/src/flutter/tools/gn",
+      "[CACHE]/builder/engine/src/flutter/tools/gn",
       "--android",
       "--no-lto"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "env_suffixes": {
       "DEPOT_TOOLS_UPDATE": [
@@ -2185,9 +2225,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "preprocess_for_goma (7).goma cache directory",
@@ -2205,7 +2245,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -2214,7 +2254,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "preprocess_for_goma (7).start_goma",
@@ -2251,9 +2291,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "preprocess_for_goma (7).start cloudtail",
@@ -2267,14 +2307,14 @@
       "-j",
       "80",
       "-C",
-      "[CACHE]/builder/src/out/android_debug"
+      "[CACHE]/builder/engine/src/out/android_debug"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "build android_debug"
   },
@@ -2293,7 +2333,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -2302,7 +2342,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (7).goma_jsonstatus",
     "~followup_annotations": [
@@ -2330,7 +2370,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -2339,7 +2379,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (7).goma_stat",
     "~followup_annotations": [
@@ -2356,7 +2396,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -2365,7 +2405,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (7).stop_goma",
     "~followup_annotations": [
@@ -2415,9 +2455,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (7).upload_log",
     "timeout": 300,
@@ -2447,9 +2487,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "postprocess_for_goma (7).stop cloudtail",
@@ -2476,9 +2516,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "preprocess_for_goma (8).goma cache directory",
@@ -2496,7 +2536,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -2505,7 +2545,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "preprocess_for_goma (8).start_goma",
@@ -2542,9 +2582,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "preprocess_for_goma (8).start cloudtail",
@@ -2558,15 +2598,15 @@
       "-j",
       "80",
       "-C",
-      "[CACHE]/builder/src/out/android_debug",
+      "[CACHE]/builder/engine/src/out/android_debug",
       ":dist"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "build android_debug :dist"
   },
@@ -2585,7 +2625,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -2594,7 +2634,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (8).goma_jsonstatus",
     "~followup_annotations": [
@@ -2622,7 +2662,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -2631,7 +2671,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (8).goma_stat",
     "~followup_annotations": [
@@ -2648,7 +2688,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -2657,7 +2697,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (8).stop_goma",
     "~followup_annotations": [
@@ -2707,9 +2747,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (8).upload_log",
     "timeout": 300,
@@ -2739,9 +2779,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "postprocess_for_goma (8).stop cloudtail",
@@ -2751,7 +2791,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/builder/src/flutter/tools/gn",
+      "[CACHE]/builder/engine/src/flutter/tools/gn",
       "--android",
       "--runtime-mode=profile",
       "--android-cpu=arm"
@@ -2759,9 +2799,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "env_suffixes": {
       "DEPOT_TOOLS_UPDATE": [
@@ -2792,9 +2832,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "preprocess_for_goma (9).goma cache directory",
@@ -2812,7 +2852,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -2821,7 +2861,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "preprocess_for_goma (9).start_goma",
@@ -2858,9 +2898,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "preprocess_for_goma (9).start cloudtail",
@@ -2874,14 +2914,14 @@
       "-j",
       "80",
       "-C",
-      "[CACHE]/builder/src/out/android_profile"
+      "[CACHE]/builder/engine/src/out/android_profile"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "build android_profile"
   },
@@ -2900,7 +2940,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -2909,7 +2949,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (9).goma_jsonstatus",
     "~followup_annotations": [
@@ -2937,7 +2977,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -2946,7 +2986,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (9).goma_stat",
     "~followup_annotations": [
@@ -2963,7 +3003,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -2972,7 +3012,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (9).stop_goma",
     "~followup_annotations": [
@@ -3022,9 +3062,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (9).upload_log",
     "timeout": 300,
@@ -3054,9 +3094,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "postprocess_for_goma (9).stop cloudtail",
@@ -3066,7 +3106,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/builder/src/flutter/tools/gn",
+      "[CACHE]/builder/engine/src/flutter/tools/gn",
       "--android",
       "--runtime-mode=release",
       "--android-cpu=arm"
@@ -3074,9 +3114,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "env_suffixes": {
       "DEPOT_TOOLS_UPDATE": [
@@ -3107,9 +3147,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "preprocess_for_goma (10).goma cache directory",
@@ -3127,7 +3167,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -3136,7 +3176,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "preprocess_for_goma (10).start_goma",
@@ -3173,9 +3213,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "preprocess_for_goma (10).start cloudtail",
@@ -3189,14 +3229,14 @@
       "-j",
       "80",
       "-C",
-      "[CACHE]/builder/src/out/android_release"
+      "[CACHE]/builder/engine/src/out/android_release"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "build android_release"
   },
@@ -3215,7 +3255,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -3224,7 +3264,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (10).goma_jsonstatus",
     "~followup_annotations": [
@@ -3252,7 +3292,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -3261,7 +3301,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (10).goma_stat",
     "~followup_annotations": [
@@ -3278,7 +3318,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -3287,7 +3327,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (10).stop_goma",
     "~followup_annotations": [
@@ -3337,9 +3377,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (10).upload_log",
     "timeout": 300,
@@ -3369,9 +3409,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "postprocess_for_goma (10).stop cloudtail",
@@ -3381,7 +3421,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/builder/src/flutter/tools/gn",
+      "[CACHE]/builder/engine/src/flutter/tools/gn",
       "--android",
       "--runtime-mode=profile",
       "--android-cpu=arm64"
@@ -3389,9 +3429,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "env_suffixes": {
       "DEPOT_TOOLS_UPDATE": [
@@ -3422,9 +3462,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "preprocess_for_goma (11).goma cache directory",
@@ -3442,7 +3482,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -3451,7 +3491,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "preprocess_for_goma (11).start_goma",
@@ -3488,9 +3528,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "preprocess_for_goma (11).start cloudtail",
@@ -3504,14 +3544,14 @@
       "-j",
       "80",
       "-C",
-      "[CACHE]/builder/src/out/android_profile_arm64"
+      "[CACHE]/builder/engine/src/out/android_profile_arm64"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "build android_profile_arm64"
   },
@@ -3530,7 +3570,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -3539,7 +3579,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (11).goma_jsonstatus",
     "~followup_annotations": [
@@ -3567,7 +3607,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -3576,7 +3616,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (11).goma_stat",
     "~followup_annotations": [
@@ -3593,7 +3633,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -3602,7 +3642,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (11).stop_goma",
     "~followup_annotations": [
@@ -3652,9 +3692,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (11).upload_log",
     "timeout": 300,
@@ -3684,9 +3724,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "postprocess_for_goma (11).stop cloudtail",
@@ -3696,7 +3736,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/builder/src/flutter/tools/gn",
+      "[CACHE]/builder/engine/src/flutter/tools/gn",
       "--android",
       "--runtime-mode=release",
       "--android-cpu=arm64"
@@ -3704,9 +3744,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "env_suffixes": {
       "DEPOT_TOOLS_UPDATE": [
@@ -3737,9 +3777,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "preprocess_for_goma (12).goma cache directory",
@@ -3757,7 +3797,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -3766,7 +3806,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "preprocess_for_goma (12).start_goma",
@@ -3803,9 +3843,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "preprocess_for_goma (12).start cloudtail",
@@ -3819,14 +3859,14 @@
       "-j",
       "80",
       "-C",
-      "[CACHE]/builder/src/out/android_release_arm64"
+      "[CACHE]/builder/engine/src/out/android_release_arm64"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "build android_release_arm64"
   },
@@ -3845,7 +3885,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -3854,7 +3894,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (12).goma_jsonstatus",
     "~followup_annotations": [
@@ -3882,7 +3922,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -3891,7 +3931,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (12).goma_stat",
     "~followup_annotations": [
@@ -3908,7 +3948,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -3917,7 +3957,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (12).stop_goma",
     "~followup_annotations": [
@@ -3967,9 +4007,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (12).upload_log",
     "timeout": 300,
@@ -3999,9 +4039,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "postprocess_for_goma (12).stop cloudtail",
@@ -4011,7 +4051,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/builder/src/flutter/tools/gn",
+      "[CACHE]/builder/engine/src/flutter/tools/gn",
       "--android",
       "--runtime-mode=profile",
       "--android-cpu=x64"
@@ -4019,9 +4059,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "env_suffixes": {
       "DEPOT_TOOLS_UPDATE": [
@@ -4052,9 +4092,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "preprocess_for_goma (13).goma cache directory",
@@ -4072,7 +4112,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -4081,7 +4121,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "preprocess_for_goma (13).start_goma",
@@ -4118,9 +4158,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "preprocess_for_goma (13).start cloudtail",
@@ -4134,14 +4174,14 @@
       "-j",
       "80",
       "-C",
-      "[CACHE]/builder/src/out/android_profile_x64"
+      "[CACHE]/builder/engine/src/out/android_profile_x64"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "build android_profile_x64"
   },
@@ -4160,7 +4200,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -4169,7 +4209,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (13).goma_jsonstatus",
     "~followup_annotations": [
@@ -4197,7 +4237,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -4206,7 +4246,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (13).goma_stat",
     "~followup_annotations": [
@@ -4223,7 +4263,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -4232,7 +4272,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (13).stop_goma",
     "~followup_annotations": [
@@ -4282,9 +4322,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (13).upload_log",
     "timeout": 300,
@@ -4314,9 +4354,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "postprocess_for_goma (13).stop cloudtail",
@@ -4326,7 +4366,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/builder/src/flutter/tools/gn",
+      "[CACHE]/builder/engine/src/flutter/tools/gn",
       "--android",
       "--runtime-mode=release",
       "--android-cpu=x64"
@@ -4334,9 +4374,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "env_suffixes": {
       "DEPOT_TOOLS_UPDATE": [
@@ -4367,9 +4407,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "preprocess_for_goma (14).goma cache directory",
@@ -4387,7 +4427,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -4396,7 +4436,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "preprocess_for_goma (14).start_goma",
@@ -4433,9 +4473,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "preprocess_for_goma (14).start cloudtail",
@@ -4449,14 +4489,14 @@
       "-j",
       "80",
       "-C",
-      "[CACHE]/builder/src/out/android_release_x64"
+      "[CACHE]/builder/engine/src/out/android_release_x64"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "build android_release_x64"
   },
@@ -4475,7 +4515,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -4484,7 +4524,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (14).goma_jsonstatus",
     "~followup_annotations": [
@@ -4512,7 +4552,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -4521,7 +4561,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (14).goma_stat",
     "~followup_annotations": [
@@ -4538,7 +4578,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -4547,7 +4587,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (14).stop_goma",
     "~followup_annotations": [
@@ -4597,9 +4637,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (14).upload_log",
     "timeout": 300,
@@ -4629,9 +4669,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "postprocess_for_goma (14).stop cloudtail",
@@ -4641,7 +4681,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/builder/src/flutter/tools/gn",
+      "[CACHE]/builder/engine/src/flutter/tools/gn",
       "--android",
       "--android-cpu=x64",
       "--no-lto"
@@ -4649,9 +4689,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "env_suffixes": {
       "DEPOT_TOOLS_UPDATE": [
@@ -4682,9 +4722,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "preprocess_for_goma (15).goma cache directory",
@@ -4702,7 +4742,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -4711,7 +4751,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "preprocess_for_goma (15).start_goma",
@@ -4748,9 +4788,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "preprocess_for_goma (15).start cloudtail",
@@ -4764,14 +4804,14 @@
       "-j",
       "80",
       "-C",
-      "[CACHE]/builder/src/out/android_debug_x64"
+      "[CACHE]/builder/engine/src/out/android_debug_x64"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "build android_debug_x64"
   },
@@ -4790,7 +4830,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -4799,7 +4839,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (15).goma_jsonstatus",
     "~followup_annotations": [
@@ -4827,7 +4867,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -4836,7 +4876,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (15).goma_stat",
     "~followup_annotations": [
@@ -4853,7 +4893,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -4862,7 +4902,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (15).stop_goma",
     "~followup_annotations": [
@@ -4912,9 +4952,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (15).upload_log",
     "timeout": 300,
@@ -4944,9 +4984,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "postprocess_for_goma (15).stop cloudtail",
@@ -4956,7 +4996,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/builder/src/flutter/tools/gn",
+      "[CACHE]/builder/engine/src/flutter/tools/gn",
       "--android",
       "--android-cpu=x86",
       "--no-lto"
@@ -4964,9 +5004,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "env_suffixes": {
       "DEPOT_TOOLS_UPDATE": [
@@ -4997,9 +5037,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "preprocess_for_goma (16).goma cache directory",
@@ -5017,7 +5057,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -5026,7 +5066,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "preprocess_for_goma (16).start_goma",
@@ -5063,9 +5103,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "preprocess_for_goma (16).start cloudtail",
@@ -5079,14 +5119,14 @@
       "-j",
       "80",
       "-C",
-      "[CACHE]/builder/src/out/android_debug_x86"
+      "[CACHE]/builder/engine/src/out/android_debug_x86"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "build android_debug_x86"
   },
@@ -5105,7 +5145,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -5114,7 +5154,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (16).goma_jsonstatus",
     "~followup_annotations": [
@@ -5142,7 +5182,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -5151,7 +5191,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (16).goma_stat",
     "~followup_annotations": [
@@ -5168,7 +5208,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -5177,7 +5217,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (16).stop_goma",
     "~followup_annotations": [
@@ -5227,9 +5267,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (16).upload_log",
     "timeout": 300,
@@ -5259,9 +5299,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "postprocess_for_goma (16).stop cloudtail",
@@ -5278,10 +5318,10 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -5295,10 +5335,10 @@
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -5319,10 +5359,10 @@
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -5342,10 +5382,10 @@
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -5360,16 +5400,16 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "[CACHE]/builder/src/third_party/icu/flutter/icudtl.dat",
+      "[CACHE]/builder/engine/src/third_party/icu/flutter/icudtl.dat",
       "[CACHE]/builder/flutter/bin/cache/artifacts/engine/linux-x64/icudtl.dat"
     ],
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -5389,10 +5429,10 @@
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -5407,16 +5447,16 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "[CACHE]/builder/src/out/host_debug_unopt/flutter_tester",
+      "[CACHE]/builder/engine/src/out/host_debug_unopt/flutter_tester",
       "[CACHE]/builder/flutter/bin/cache/artifacts/engine/linux-x64/flutter_tester"
     ],
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -5436,10 +5476,10 @@
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -5454,16 +5494,16 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "[CACHE]/builder/src/out/host_debug_unopt/gen/flutter/lib/snapshot/isolate_snapshot.bin",
+      "[CACHE]/builder/engine/src/out/host_debug_unopt/gen/flutter/lib/snapshot/isolate_snapshot.bin",
       "[CACHE]/builder/flutter/bin/cache/artifacts/engine/linux-x64/isolate_snapshot.bin"
     ],
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -5483,10 +5523,10 @@
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -5501,16 +5541,16 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "[CACHE]/builder/src/out/host_debug_unopt/gen/flutter/lib/snapshot/vm_isolate_snapshot.bin",
+      "[CACHE]/builder/engine/src/out/host_debug_unopt/gen/flutter/lib/snapshot/vm_isolate_snapshot.bin",
       "[CACHE]/builder/flutter/bin/cache/artifacts/engine/linux-x64/vm_isolate_snapshot.bin"
     ],
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -5530,10 +5570,10 @@
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -5548,16 +5588,16 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "[CACHE]/builder/src/out/host_debug_unopt/gen/frontend_server.dart.snapshot",
+      "[CACHE]/builder/engine/src/out/host_debug_unopt/gen/frontend_server.dart.snapshot",
       "[CACHE]/builder/flutter/bin/cache/artifacts/engine/linux-x64/frontend_server.dart.snapshot"
     ],
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -5577,10 +5617,10 @@
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -5595,16 +5635,16 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "[CACHE]/builder/src/out/host_debug_unopt/gen/const_finder.dart.snapshot",
+      "[CACHE]/builder/engine/src/out/host_debug_unopt/gen/const_finder.dart.snapshot",
       "[CACHE]/builder/flutter/bin/cache/artifacts/engine/linux-x64/const_finder.dart.snapshot"
     ],
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -5626,10 +5666,10 @@
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -5649,10 +5689,10 @@
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -5667,16 +5707,16 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "[CACHE]/builder/src/out/android_profile/clang_x64/gen_snapshot",
+      "[CACHE]/builder/engine/src/out/android_profile/clang_x64/gen_snapshot",
       "[CACHE]/builder/flutter/bin/cache/artifacts/engine/android-arm-profile/linux-x64/gen_snapshot"
     ],
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -5698,10 +5738,10 @@
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -5721,10 +5761,10 @@
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -5739,16 +5779,16 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "[CACHE]/builder/src/out/android_release/clang_x64/gen_snapshot",
+      "[CACHE]/builder/engine/src/out/android_release/clang_x64/gen_snapshot",
       "[CACHE]/builder/flutter/bin/cache/artifacts/engine/android-arm-release/linux-x64/gen_snapshot"
     ],
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -5770,10 +5810,10 @@
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -5793,10 +5833,10 @@
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -5811,16 +5851,16 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "[CACHE]/builder/src/out/android_profile_arm64/clang_x64/gen_snapshot",
+      "[CACHE]/builder/engine/src/out/android_profile_arm64/clang_x64/gen_snapshot",
       "[CACHE]/builder/flutter/bin/cache/artifacts/engine/android-arm64-profile/linux-x64/gen_snapshot"
     ],
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -5842,10 +5882,10 @@
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -5865,10 +5905,10 @@
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -5883,16 +5923,16 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "[CACHE]/builder/src/out/android_release_arm64/clang_x64/gen_snapshot",
+      "[CACHE]/builder/engine/src/out/android_release_arm64/clang_x64/gen_snapshot",
       "[CACHE]/builder/flutter/bin/cache/artifacts/engine/android-arm64-release/linux-x64/gen_snapshot"
     ],
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -5914,10 +5954,10 @@
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -5937,10 +5977,10 @@
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -5955,16 +5995,16 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "[CACHE]/builder/src/out/android_profile_x64/clang_x64/gen_snapshot",
+      "[CACHE]/builder/engine/src/out/android_profile_x64/clang_x64/gen_snapshot",
       "[CACHE]/builder/flutter/bin/cache/artifacts/engine/android-x64-profile/linux-x64/gen_snapshot"
     ],
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -5986,10 +6026,10 @@
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -6009,10 +6049,10 @@
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -6027,16 +6067,16 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "[CACHE]/builder/src/out/android_release_x64/clang_x64/gen_snapshot",
+      "[CACHE]/builder/engine/src/out/android_release_x64/clang_x64/gen_snapshot",
       "[CACHE]/builder/flutter/bin/cache/artifacts/engine/android-x64-release/linux-x64/gen_snapshot"
     ],
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -6052,10 +6092,10 @@
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -6070,10 +6110,10 @@
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -6088,10 +6128,10 @@
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -6106,10 +6146,10 @@
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -6123,16 +6163,16 @@
       "--json-output",
       "/path/to/tmp/json",
       "copytree",
-      "[CACHE]/builder/src/out/host_debug/dart-sdk",
+      "[CACHE]/builder/engine/src/out/host_debug/dart-sdk",
       "[CACHE]/builder/flutter/bin/cache/dart-sdk"
     ],
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -6147,16 +6187,16 @@
       "--json-output",
       "/path/to/tmp/json",
       "symlink",
-      "[CACHE]/builder/src/out/host_debug/gen/dart-pkg",
+      "[CACHE]/builder/engine/src/out/host_debug/gen/dart-pkg",
       "[CACHE]/builder/flutter/bin/cache/pkg"
     ],
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -6171,16 +6211,16 @@
       "--json-output",
       "/path/to/tmp/json",
       "symlink",
-      "[CACHE]/builder/src/out/host_debug/flutter_patched_sdk",
+      "[CACHE]/builder/engine/src/out/host_debug/flutter_patched_sdk",
       "[CACHE]/builder/flutter/bin/cache/artifacts/engine/common/flutter_patched_sdk"
     ],
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -6195,16 +6235,16 @@
       "--json-output",
       "/path/to/tmp/json",
       "symlink",
-      "[CACHE]/builder/src/out/host_release/flutter_patched_sdk",
+      "[CACHE]/builder/engine/src/out/host_release/flutter_patched_sdk",
       "[CACHE]/builder/flutter/bin/cache/artifacts/engine/common/flutter_patched_sdk_product"
     ],
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -6220,10 +6260,10 @@
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -6234,15 +6274,15 @@
       "[CACHE]/builder/flutter/bin/flutter",
       "update-packages",
       "--local-engine=host_debug",
-      "--local-engine-src-path=[CACHE]/builder/src"
+      "--local-engine-src-path=[CACHE]/builder/engine/src"
     ],
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -6254,15 +6294,15 @@
       "--enable-asserts",
       "dev/bots/analyze.dart",
       "--dart-sdk",
-      "[CACHE]/builder/src/out/host_debug/dart-sdk"
+      "[CACHE]/builder/engine/src/out/host_debug/dart-sdk"
     ],
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -6271,19 +6311,19 @@
   },
   {
     "cmd": [
-      "[CACHE]/builder/src/flutter/lib/web_ui/dev/web_engine_analysis.sh"
+      "[CACHE]/builder/engine/src/flutter/lib/web_ui/dev/web_engine_analysis.sh"
     ],
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "ENGINE_PATH": "[CACHE]/builder",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16",
-      "WEB_UI_DIR": "[CACHE]/builder/src/flutter/lib/web_ui"
+      "WEB_UI_DIR": "[CACHE]/builder/engine/src/flutter/lib/web_ui"
     },
     "name": "flutter web engine analyze",
     "timeout": 1200
@@ -6293,15 +6333,15 @@
       "dart",
       "dev/bots/test.dart",
       "--local-engine=host_debug",
-      "--local-engine-src-path=[CACHE]/builder/src"
+      "--local-engine-src-path=[CACHE]/builder/engine/src"
     ],
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "SHARD": "add_to_app_life_cycle_tests",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
@@ -6314,15 +6354,15 @@
       "dart",
       "dev/bots/test.dart",
       "--local-engine=host_debug",
-      "--local-engine-src-path=[CACHE]/builder/src"
+      "--local-engine-src-path=[CACHE]/builder/engine/src"
     ],
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "SHARD": "build_tests",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
@@ -6335,15 +6375,15 @@
       "dart",
       "dev/bots/test.dart",
       "--local-engine=host_debug",
-      "--local-engine-src-path=[CACHE]/builder/src"
+      "--local-engine-src-path=[CACHE]/builder/engine/src"
     ],
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "SHARD": "framework_coverage",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
@@ -6356,15 +6396,15 @@
       "dart",
       "dev/bots/test.dart",
       "--local-engine=host_debug",
-      "--local-engine-src-path=[CACHE]/builder/src"
+      "--local-engine-src-path=[CACHE]/builder/engine/src"
     ],
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "SHARD": "framework_tests",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
@@ -6377,15 +6417,15 @@
       "dart",
       "dev/bots/test.dart",
       "--local-engine=host_debug",
-      "--local-engine-src-path=[CACHE]/builder/src"
+      "--local-engine-src-path=[CACHE]/builder/engine/src"
     ],
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "SHARD": "tool_coverage",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
@@ -6398,15 +6438,15 @@
       "dart",
       "dev/bots/test.dart",
       "--local-engine=host_debug",
-      "--local-engine-src-path=[CACHE]/builder/src"
+      "--local-engine-src-path=[CACHE]/builder/engine/src"
     ],
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "SHARD": "tool_tests",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
@@ -6419,15 +6459,15 @@
       "dart",
       "dev/bots/test.dart",
       "--local-engine=host_debug",
-      "--local-engine-src-path=[CACHE]/builder/src"
+      "--local-engine-src-path=[CACHE]/builder/engine/src"
     ],
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "SHARD": "web_tool_tests",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
@@ -6440,15 +6480,15 @@
       "dart",
       "dev/bots/test.dart",
       "--local-engine=host_debug",
-      "--local-engine-src-path=[CACHE]/builder/src"
+      "--local-engine-src-path=[CACHE]/builder/engine/src"
     ],
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "SHARD": "web_tests",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
@@ -6460,7 +6500,7 @@
     "cmd": [
       "python",
       "-u",
-      "[CACHE]/builder/src/third_party/dart/tools/task_kill.py"
+      "[CACHE]/builder/engine/src/third_party/dart/tools/task_kill.py"
     ],
     "name": "kill processes (2)"
   },
diff --git a/recipes/dart/flutter_engine.expected/only-run-webtests-suite.json b/recipes/dart/flutter_engine.expected/only-run-webtests-suite.json
index 7441627..57e1ba5 100644
--- a/recipes/dart/flutter_engine.expected/only-run-webtests-suite.json
+++ b/recipes/dart/flutter_engine.expected/only-run-webtests-suite.json
@@ -9,12 +9,26 @@
       "rmcontents",
       "[CACHE]/builder"
     ],
-    "cwd": "[CACHE]/builder",
     "infra_step": true,
     "name": "everything"
   },
   {
     "cmd": [
+      "vpython",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "ensure-directory",
+      "--mode",
+      "0777",
+      "[CACHE]/builder/engine"
+    ],
+    "infra_step": true,
+    "name": "mkdir engine"
+  },
+  {
+    "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[depot_tools::gitiles]/resources/gerrit_client.py",
@@ -25,7 +39,7 @@
       "--format",
       "text"
     ],
-    "cwd": "[CACHE]/builder",
+    "cwd": "[CACHE]/builder/engine",
     "name": "fetch ffffffff:commits.json"
   },
   {
@@ -34,7 +48,7 @@
       "-u",
       "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
       "--spec-path",
-      "cache_dir = '[CACHE]/git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'src/flutter', 'url': 'https://dart.googlesource.com/external/github.com/flutter/engine'}, {'deps_file': '.DEPS.git', 'managed': True, 'name': 'flutter', 'url': 'https://dart.googlesource.com/external/github.com/flutter/flutter'}]\ntarget_os = ['android']",
+      "cache_dir = '[CACHE]/git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'src/flutter', 'url': 'https://dart.googlesource.com/external/github.com/flutter/engine'}, {'deps_file': '.DEPS.git', 'managed': True, 'name': '../flutter', 'url': 'https://dart.googlesource.com/external/github.com/flutter/flutter'}]\ntarget_os = ['android']",
       "--revision_mapping_file",
       "{}",
       "--git-cache-dir",
@@ -44,13 +58,13 @@
       "--output_json",
       "/path/to/tmp/json",
       "--revision",
-      "flutter@HEAD",
+      "../flutter@HEAD",
       "--revision",
       "src/flutter@bar",
       "--revision",
       "src/third_party/dart@foo"
     ],
-    "cwd": "[CACHE]/builder",
+    "cwd": "[CACHE]/builder/engine",
     "env": {
       "GIT_HTTP_LOW_SPEED_LIMIT": "102400",
       "GIT_HTTP_LOW_SPEED_TIME": "300"
@@ -70,14 +84,14 @@
       "@@@STEP_LOG_LINE@json.output@{@@@",
       "@@@STEP_LOG_LINE@json.output@  \"did_run\": true, @@@",
       "@@@STEP_LOG_LINE@json.output@  \"fixed_revisions\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"flutter\": \"HEAD\", @@@",
+      "@@@STEP_LOG_LINE@json.output@    \"../flutter\": \"HEAD\", @@@",
       "@@@STEP_LOG_LINE@json.output@    \"src/flutter\": \"bar\", @@@",
       "@@@STEP_LOG_LINE@json.output@    \"src/third_party/dart\": \"foo\"@@@",
       "@@@STEP_LOG_LINE@json.output@  }, @@@",
       "@@@STEP_LOG_LINE@json.output@  \"manifest\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"flutter\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@      \"repository\": \"https://fake.org/flutter.git\", @@@",
-      "@@@STEP_LOG_LINE@json.output@      \"revision\": \"ff25d17873bba4bc564d8c7217280aa254ed4541\"@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"../flutter\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@      \"repository\": \"https://fake.org/../flutter.git\", @@@",
+      "@@@STEP_LOG_LINE@json.output@      \"revision\": \"ecd9a748968d17ba8524a1801b503f35c40a8f05\"@@@",
       "@@@STEP_LOG_LINE@json.output@    }, @@@",
       "@@@STEP_LOG_LINE@json.output@    \"src/flutter\": {@@@",
       "@@@STEP_LOG_LINE@json.output@      \"repository\": \"https://fake.org/src/flutter.git\", @@@",
@@ -94,10 +108,10 @@
       "@@@STEP_LOG_LINE@json.output@  \"root\": \"src/flutter\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"source_manifest\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"directories\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@      \"flutter\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@      \"../flutter\": {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"git_checkout\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@          \"repo_url\": \"https://fake.org/flutter.git\", @@@",
-      "@@@STEP_LOG_LINE@json.output@          \"revision\": \"ff25d17873bba4bc564d8c7217280aa254ed4541\"@@@",
+      "@@@STEP_LOG_LINE@json.output@          \"repo_url\": \"https://fake.org/../flutter.git\", @@@",
+      "@@@STEP_LOG_LINE@json.output@          \"revision\": \"ecd9a748968d17ba8524a1801b503f35c40a8f05\"@@@",
       "@@@STEP_LOG_LINE@json.output@        }@@@",
       "@@@STEP_LOG_LINE@json.output@      }, @@@",
       "@@@STEP_LOG_LINE@json.output@      \"src/flutter\": {@@@",
@@ -131,7 +145,7 @@
       "RECIPE_REPO[depot_tools]/gclient.py",
       "runhooks"
     ],
-    "cwd": "[CACHE]/builder",
+    "cwd": "[CACHE]/builder/engine",
     "env_suffixes": {
       "PATH": [
         "RECIPE_REPO[depot_tools]"
@@ -141,9 +155,35 @@
   },
   {
     "cmd": [
-      "src/third_party/dart/tools/3xhead_flutter_hooks.sh"
+      "vpython",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "symlink",
+      "[CACHE]/builder/flutter",
+      "[CACHE]/builder/engine/flutter"
     ],
-    "cwd": "[CACHE]/builder",
+    "cwd": "[CACHE]/builder/engine",
+    "env": {
+      "DEPOT_TOOLS_UPDATE": "0"
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "name": "symlink flutter to new checkout location"
+  },
+  {
+    "cmd": [
+      "[CACHE]/builder/engine/src/third_party/dart/tools/3xhead_flutter_hooks.sh"
+    ],
+    "cwd": "[CACHE]/builder/engine",
     "env": {
       "DEPOT_TOOLS_UPDATE": "0"
     },
@@ -225,7 +265,7 @@
     "cmd": [
       "python",
       "-u",
-      "[CACHE]/builder/src/third_party/dart/tools/task_kill.py"
+      "[CACHE]/builder/engine/src/third_party/dart/tools/task_kill.py"
     ],
     "name": "kill processes"
   },
@@ -238,20 +278,20 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "name": "accept android licenses"
   },
   {
     "cmd": [
-      "[CACHE]/builder/src/flutter/tools/gn",
+      "[CACHE]/builder/engine/src/flutter/tools/gn",
       "--full-dart-sdk"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "env_suffixes": {
@@ -283,7 +323,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "infra_step": true,
@@ -302,7 +342,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -347,7 +387,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "infra_step": true,
@@ -362,12 +402,12 @@
       "-j",
       "80",
       "-C",
-      "[CACHE]/builder/src/out/host_debug"
+      "[CACHE]/builder/engine/src/out/host_debug"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "name": "build host_debug"
@@ -387,7 +427,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -423,7 +463,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -448,7 +488,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -506,7 +546,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "name": "postprocess_for_goma.upload_log",
@@ -537,7 +577,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "infra_step": true,
@@ -565,7 +605,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "infra_step": true,
@@ -584,7 +624,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -629,7 +669,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "infra_step": true,
@@ -644,13 +684,13 @@
       "-j",
       "80",
       "-C",
-      "[CACHE]/builder/src/out/host_debug",
+      "[CACHE]/builder/engine/src/out/host_debug",
       "create_full_sdk"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "name": "build host_debug create_full_sdk"
@@ -670,7 +710,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -706,7 +746,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -731,7 +771,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -789,7 +829,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "name": "postprocess_for_goma (2).upload_log",
@@ -820,7 +860,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "infra_step": true,
@@ -831,13 +871,13 @@
   },
   {
     "cmd": [
-      "[CACHE]/builder/src/flutter/tools/gn",
+      "[CACHE]/builder/engine/src/flutter/tools/gn",
       "--unoptimized"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "env_suffixes": {
@@ -869,7 +909,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "infra_step": true,
@@ -888,7 +928,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -933,7 +973,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "infra_step": true,
@@ -948,12 +988,12 @@
       "-j",
       "80",
       "-C",
-      "[CACHE]/builder/src/out/host_debug_unopt"
+      "[CACHE]/builder/engine/src/out/host_debug_unopt"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "name": "build host_debug_unopt"
@@ -973,7 +1013,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -1009,7 +1049,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -1034,7 +1074,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -1092,7 +1132,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "name": "postprocess_for_goma (3).upload_log",
@@ -1123,7 +1163,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "infra_step": true,
@@ -1151,7 +1191,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "infra_step": true,
@@ -1170,7 +1210,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -1215,7 +1255,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "infra_step": true,
@@ -1230,13 +1270,13 @@
       "-j",
       "80",
       "-C",
-      "[CACHE]/builder/src/out/host_debug_unopt",
+      "[CACHE]/builder/engine/src/out/host_debug_unopt",
       "generate_dart_ui"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "name": "build host_debug_unopt generate_dart_ui"
@@ -1256,7 +1296,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -1292,7 +1332,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -1317,7 +1357,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -1375,7 +1415,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "name": "postprocess_for_goma (4).upload_log",
@@ -1406,7 +1446,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "infra_step": true,
@@ -1417,13 +1457,13 @@
   },
   {
     "cmd": [
-      "[CACHE]/builder/src/flutter/tools/gn",
+      "[CACHE]/builder/engine/src/flutter/tools/gn",
       "--runtime-mode=release"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "env_suffixes": {
@@ -1455,7 +1495,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "infra_step": true,
@@ -1474,7 +1514,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -1519,7 +1559,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "infra_step": true,
@@ -1534,12 +1574,12 @@
       "-j",
       "80",
       "-C",
-      "[CACHE]/builder/src/out/host_release"
+      "[CACHE]/builder/engine/src/out/host_release"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "name": "build host_release"
@@ -1559,7 +1599,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -1595,7 +1635,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -1620,7 +1660,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -1678,7 +1718,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "name": "postprocess_for_goma (5).upload_log",
@@ -1709,7 +1749,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "infra_step": true,
@@ -1720,7 +1760,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/builder/src/flutter/tools/gn",
+      "[CACHE]/builder/engine/src/flutter/tools/gn",
       "--fuchsia",
       "--fuchsia-cpu",
       "x64",
@@ -1730,7 +1770,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "env_suffixes": {
@@ -1762,7 +1802,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "infra_step": true,
@@ -1781,7 +1821,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -1826,7 +1866,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "infra_step": true,
@@ -1841,14 +1881,14 @@
       "-j",
       "80",
       "-C",
-      "[CACHE]/builder/src/out/fuchsia_debug_x64",
+      "[CACHE]/builder/engine/src/out/fuchsia_debug_x64",
       "flutter/shell/platform/fuchsia:fuchsia",
       "fuchsia_tests"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "name": "build fuchsia_debug_x64 flutter/shell/platform/fuchsia:fuchsia fuchsia_tests"
@@ -1868,7 +1908,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -1904,7 +1944,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -1929,7 +1969,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -1987,7 +2027,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "name": "postprocess_for_goma (6).upload_log",
@@ -2018,7 +2058,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "infra_step": true,
@@ -2037,12 +2077,12 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/builder/src/flutter/third_party/browsers/chrome"
+      "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "infra_step": true,
@@ -2053,7 +2093,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/builder/src/flutter/third_party/browsers/chrome",
+      "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome",
       "-ensure-file",
       "dart/browsers/chrome/${platform} version:84",
       "-max-threads",
@@ -2064,7 +2104,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "name": "ensure_installed",
@@ -2087,12 +2127,12 @@
       "/bin/bash",
       "flutter/ci/analyze.sh"
     ],
-    "cwd": "[CACHE]/builder/src",
+    "cwd": "[CACHE]/builder/engine/src",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "env_suffixes": {
       "DEPOT_TOOLS_UPDATE": [
@@ -2109,12 +2149,12 @@
       "/bin/bash",
       "flutter/testing/run_tests.sh"
     ],
-    "cwd": "[CACHE]/builder/src",
+    "cwd": "[CACHE]/builder/engine/src",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "env_suffixes": {
       "DEPOT_TOOLS_UPDATE": [
@@ -2129,32 +2169,32 @@
   {
     "cmd": [
       "dart",
-      "[CACHE]/builder/src/flutter/shell/testing/observatory/test.dart",
-      "[CACHE]/builder/src/out/host_debug/flutter_tester",
-      "[CACHE]/builder/src/flutter/shell/testing/observatory/empty_main.dart"
+      "[CACHE]/builder/engine/src/flutter/shell/testing/observatory/test.dart",
+      "[CACHE]/builder/engine/src/out/host_debug/flutter_tester",
+      "[CACHE]/builder/engine/src/flutter/shell/testing/observatory/empty_main.dart"
     ],
-    "cwd": "[CACHE]/builder/src",
+    "cwd": "[CACHE]/builder/engine/src",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "test observatory and service protocol",
     "timeout": 300
   },
   {
     "cmd": [
-      "[CACHE]/builder/src/flutter/tools/gn",
+      "[CACHE]/builder/engine/src/flutter/tools/gn",
       "--android",
       "--no-lto"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "env_suffixes": {
       "DEPOT_TOOLS_UPDATE": [
@@ -2185,9 +2225,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "preprocess_for_goma (7).goma cache directory",
@@ -2205,7 +2245,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -2214,7 +2254,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "preprocess_for_goma (7).start_goma",
@@ -2251,9 +2291,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "preprocess_for_goma (7).start cloudtail",
@@ -2267,14 +2307,14 @@
       "-j",
       "80",
       "-C",
-      "[CACHE]/builder/src/out/android_debug"
+      "[CACHE]/builder/engine/src/out/android_debug"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "build android_debug"
   },
@@ -2293,7 +2333,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -2302,7 +2342,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (7).goma_jsonstatus",
     "~followup_annotations": [
@@ -2330,7 +2370,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -2339,7 +2379,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (7).goma_stat",
     "~followup_annotations": [
@@ -2356,7 +2396,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -2365,7 +2405,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (7).stop_goma",
     "~followup_annotations": [
@@ -2415,9 +2455,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (7).upload_log",
     "timeout": 300,
@@ -2447,9 +2487,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "postprocess_for_goma (7).stop cloudtail",
@@ -2476,9 +2516,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "preprocess_for_goma (8).goma cache directory",
@@ -2496,7 +2536,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -2505,7 +2545,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "preprocess_for_goma (8).start_goma",
@@ -2542,9 +2582,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "preprocess_for_goma (8).start cloudtail",
@@ -2558,15 +2598,15 @@
       "-j",
       "80",
       "-C",
-      "[CACHE]/builder/src/out/android_debug",
+      "[CACHE]/builder/engine/src/out/android_debug",
       ":dist"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "build android_debug :dist"
   },
@@ -2585,7 +2625,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -2594,7 +2634,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (8).goma_jsonstatus",
     "~followup_annotations": [
@@ -2622,7 +2662,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -2631,7 +2671,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (8).goma_stat",
     "~followup_annotations": [
@@ -2648,7 +2688,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -2657,7 +2697,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (8).stop_goma",
     "~followup_annotations": [
@@ -2707,9 +2747,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (8).upload_log",
     "timeout": 300,
@@ -2739,9 +2779,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "postprocess_for_goma (8).stop cloudtail",
@@ -2751,7 +2791,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/builder/src/flutter/tools/gn",
+      "[CACHE]/builder/engine/src/flutter/tools/gn",
       "--android",
       "--runtime-mode=profile",
       "--android-cpu=arm"
@@ -2759,9 +2799,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "env_suffixes": {
       "DEPOT_TOOLS_UPDATE": [
@@ -2792,9 +2832,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "preprocess_for_goma (9).goma cache directory",
@@ -2812,7 +2852,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -2821,7 +2861,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "preprocess_for_goma (9).start_goma",
@@ -2858,9 +2898,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "preprocess_for_goma (9).start cloudtail",
@@ -2874,14 +2914,14 @@
       "-j",
       "80",
       "-C",
-      "[CACHE]/builder/src/out/android_profile"
+      "[CACHE]/builder/engine/src/out/android_profile"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "build android_profile"
   },
@@ -2900,7 +2940,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -2909,7 +2949,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (9).goma_jsonstatus",
     "~followup_annotations": [
@@ -2937,7 +2977,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -2946,7 +2986,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (9).goma_stat",
     "~followup_annotations": [
@@ -2963,7 +3003,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -2972,7 +3012,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (9).stop_goma",
     "~followup_annotations": [
@@ -3022,9 +3062,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (9).upload_log",
     "timeout": 300,
@@ -3054,9 +3094,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "postprocess_for_goma (9).stop cloudtail",
@@ -3066,7 +3106,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/builder/src/flutter/tools/gn",
+      "[CACHE]/builder/engine/src/flutter/tools/gn",
       "--android",
       "--runtime-mode=release",
       "--android-cpu=arm"
@@ -3074,9 +3114,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "env_suffixes": {
       "DEPOT_TOOLS_UPDATE": [
@@ -3107,9 +3147,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "preprocess_for_goma (10).goma cache directory",
@@ -3127,7 +3167,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -3136,7 +3176,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "preprocess_for_goma (10).start_goma",
@@ -3173,9 +3213,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "preprocess_for_goma (10).start cloudtail",
@@ -3189,14 +3229,14 @@
       "-j",
       "80",
       "-C",
-      "[CACHE]/builder/src/out/android_release"
+      "[CACHE]/builder/engine/src/out/android_release"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "build android_release"
   },
@@ -3215,7 +3255,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -3224,7 +3264,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (10).goma_jsonstatus",
     "~followup_annotations": [
@@ -3252,7 +3292,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -3261,7 +3301,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (10).goma_stat",
     "~followup_annotations": [
@@ -3278,7 +3318,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -3287,7 +3327,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (10).stop_goma",
     "~followup_annotations": [
@@ -3337,9 +3377,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (10).upload_log",
     "timeout": 300,
@@ -3369,9 +3409,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "postprocess_for_goma (10).stop cloudtail",
@@ -3381,7 +3421,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/builder/src/flutter/tools/gn",
+      "[CACHE]/builder/engine/src/flutter/tools/gn",
       "--android",
       "--runtime-mode=profile",
       "--android-cpu=arm64"
@@ -3389,9 +3429,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "env_suffixes": {
       "DEPOT_TOOLS_UPDATE": [
@@ -3422,9 +3462,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "preprocess_for_goma (11).goma cache directory",
@@ -3442,7 +3482,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -3451,7 +3491,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "preprocess_for_goma (11).start_goma",
@@ -3488,9 +3528,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "preprocess_for_goma (11).start cloudtail",
@@ -3504,14 +3544,14 @@
       "-j",
       "80",
       "-C",
-      "[CACHE]/builder/src/out/android_profile_arm64"
+      "[CACHE]/builder/engine/src/out/android_profile_arm64"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "build android_profile_arm64"
   },
@@ -3530,7 +3570,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -3539,7 +3579,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (11).goma_jsonstatus",
     "~followup_annotations": [
@@ -3567,7 +3607,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -3576,7 +3616,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (11).goma_stat",
     "~followup_annotations": [
@@ -3593,7 +3633,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -3602,7 +3642,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (11).stop_goma",
     "~followup_annotations": [
@@ -3652,9 +3692,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (11).upload_log",
     "timeout": 300,
@@ -3684,9 +3724,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "postprocess_for_goma (11).stop cloudtail",
@@ -3696,7 +3736,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/builder/src/flutter/tools/gn",
+      "[CACHE]/builder/engine/src/flutter/tools/gn",
       "--android",
       "--runtime-mode=release",
       "--android-cpu=arm64"
@@ -3704,9 +3744,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "env_suffixes": {
       "DEPOT_TOOLS_UPDATE": [
@@ -3737,9 +3777,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "preprocess_for_goma (12).goma cache directory",
@@ -3757,7 +3797,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -3766,7 +3806,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "preprocess_for_goma (12).start_goma",
@@ -3803,9 +3843,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "preprocess_for_goma (12).start cloudtail",
@@ -3819,14 +3859,14 @@
       "-j",
       "80",
       "-C",
-      "[CACHE]/builder/src/out/android_release_arm64"
+      "[CACHE]/builder/engine/src/out/android_release_arm64"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "build android_release_arm64"
   },
@@ -3845,7 +3885,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -3854,7 +3894,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (12).goma_jsonstatus",
     "~followup_annotations": [
@@ -3882,7 +3922,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -3891,7 +3931,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (12).goma_stat",
     "~followup_annotations": [
@@ -3908,7 +3948,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -3917,7 +3957,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (12).stop_goma",
     "~followup_annotations": [
@@ -3967,9 +4007,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (12).upload_log",
     "timeout": 300,
@@ -3999,9 +4039,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "postprocess_for_goma (12).stop cloudtail",
@@ -4011,7 +4051,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/builder/src/flutter/tools/gn",
+      "[CACHE]/builder/engine/src/flutter/tools/gn",
       "--android",
       "--runtime-mode=profile",
       "--android-cpu=x64"
@@ -4019,9 +4059,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "env_suffixes": {
       "DEPOT_TOOLS_UPDATE": [
@@ -4052,9 +4092,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "preprocess_for_goma (13).goma cache directory",
@@ -4072,7 +4112,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -4081,7 +4121,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "preprocess_for_goma (13).start_goma",
@@ -4118,9 +4158,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "preprocess_for_goma (13).start cloudtail",
@@ -4134,14 +4174,14 @@
       "-j",
       "80",
       "-C",
-      "[CACHE]/builder/src/out/android_profile_x64"
+      "[CACHE]/builder/engine/src/out/android_profile_x64"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "build android_profile_x64"
   },
@@ -4160,7 +4200,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -4169,7 +4209,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (13).goma_jsonstatus",
     "~followup_annotations": [
@@ -4197,7 +4237,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -4206,7 +4246,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (13).goma_stat",
     "~followup_annotations": [
@@ -4223,7 +4263,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -4232,7 +4272,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (13).stop_goma",
     "~followup_annotations": [
@@ -4282,9 +4322,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (13).upload_log",
     "timeout": 300,
@@ -4314,9 +4354,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "postprocess_for_goma (13).stop cloudtail",
@@ -4326,7 +4366,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/builder/src/flutter/tools/gn",
+      "[CACHE]/builder/engine/src/flutter/tools/gn",
       "--android",
       "--runtime-mode=release",
       "--android-cpu=x64"
@@ -4334,9 +4374,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "env_suffixes": {
       "DEPOT_TOOLS_UPDATE": [
@@ -4367,9 +4407,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "preprocess_for_goma (14).goma cache directory",
@@ -4387,7 +4427,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -4396,7 +4436,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "preprocess_for_goma (14).start_goma",
@@ -4433,9 +4473,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "preprocess_for_goma (14).start cloudtail",
@@ -4449,14 +4489,14 @@
       "-j",
       "80",
       "-C",
-      "[CACHE]/builder/src/out/android_release_x64"
+      "[CACHE]/builder/engine/src/out/android_release_x64"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "build android_release_x64"
   },
@@ -4475,7 +4515,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -4484,7 +4524,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (14).goma_jsonstatus",
     "~followup_annotations": [
@@ -4512,7 +4552,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -4521,7 +4561,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (14).goma_stat",
     "~followup_annotations": [
@@ -4538,7 +4578,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -4547,7 +4587,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (14).stop_goma",
     "~followup_annotations": [
@@ -4597,9 +4637,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (14).upload_log",
     "timeout": 300,
@@ -4629,9 +4669,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "postprocess_for_goma (14).stop cloudtail",
@@ -4641,7 +4681,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/builder/src/flutter/tools/gn",
+      "[CACHE]/builder/engine/src/flutter/tools/gn",
       "--android",
       "--android-cpu=x64",
       "--no-lto"
@@ -4649,9 +4689,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "env_suffixes": {
       "DEPOT_TOOLS_UPDATE": [
@@ -4682,9 +4722,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "preprocess_for_goma (15).goma cache directory",
@@ -4702,7 +4742,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -4711,7 +4751,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "preprocess_for_goma (15).start_goma",
@@ -4748,9 +4788,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "preprocess_for_goma (15).start cloudtail",
@@ -4764,14 +4804,14 @@
       "-j",
       "80",
       "-C",
-      "[CACHE]/builder/src/out/android_debug_x64"
+      "[CACHE]/builder/engine/src/out/android_debug_x64"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "build android_debug_x64"
   },
@@ -4790,7 +4830,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -4799,7 +4839,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (15).goma_jsonstatus",
     "~followup_annotations": [
@@ -4827,7 +4867,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -4836,7 +4876,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (15).goma_stat",
     "~followup_annotations": [
@@ -4853,7 +4893,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -4862,7 +4902,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (15).stop_goma",
     "~followup_annotations": [
@@ -4912,9 +4952,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (15).upload_log",
     "timeout": 300,
@@ -4944,9 +4984,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "postprocess_for_goma (15).stop cloudtail",
@@ -4956,7 +4996,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/builder/src/flutter/tools/gn",
+      "[CACHE]/builder/engine/src/flutter/tools/gn",
       "--android",
       "--android-cpu=x86",
       "--no-lto"
@@ -4964,9 +5004,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "env_suffixes": {
       "DEPOT_TOOLS_UPDATE": [
@@ -4997,9 +5037,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "preprocess_for_goma (16).goma cache directory",
@@ -5017,7 +5057,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -5026,7 +5066,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "preprocess_for_goma (16).start_goma",
@@ -5063,9 +5103,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "preprocess_for_goma (16).start cloudtail",
@@ -5079,14 +5119,14 @@
       "-j",
       "80",
       "-C",
-      "[CACHE]/builder/src/out/android_debug_x86"
+      "[CACHE]/builder/engine/src/out/android_debug_x86"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "build android_debug_x86"
   },
@@ -5105,7 +5145,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -5114,7 +5154,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (16).goma_jsonstatus",
     "~followup_annotations": [
@@ -5142,7 +5182,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -5151,7 +5191,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (16).goma_stat",
     "~followup_annotations": [
@@ -5168,7 +5208,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -5177,7 +5217,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (16).stop_goma",
     "~followup_annotations": [
@@ -5227,9 +5267,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (16).upload_log",
     "timeout": 300,
@@ -5259,9 +5299,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "postprocess_for_goma (16).stop cloudtail",
@@ -5278,10 +5318,10 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -5295,10 +5335,10 @@
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -5319,10 +5359,10 @@
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -5342,10 +5382,10 @@
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -5360,16 +5400,16 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "[CACHE]/builder/src/third_party/icu/flutter/icudtl.dat",
+      "[CACHE]/builder/engine/src/third_party/icu/flutter/icudtl.dat",
       "[CACHE]/builder/flutter/bin/cache/artifacts/engine/linux-x64/icudtl.dat"
     ],
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -5389,10 +5429,10 @@
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -5407,16 +5447,16 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "[CACHE]/builder/src/out/host_debug_unopt/flutter_tester",
+      "[CACHE]/builder/engine/src/out/host_debug_unopt/flutter_tester",
       "[CACHE]/builder/flutter/bin/cache/artifacts/engine/linux-x64/flutter_tester"
     ],
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -5436,10 +5476,10 @@
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -5454,16 +5494,16 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "[CACHE]/builder/src/out/host_debug_unopt/gen/flutter/lib/snapshot/isolate_snapshot.bin",
+      "[CACHE]/builder/engine/src/out/host_debug_unopt/gen/flutter/lib/snapshot/isolate_snapshot.bin",
       "[CACHE]/builder/flutter/bin/cache/artifacts/engine/linux-x64/isolate_snapshot.bin"
     ],
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -5483,10 +5523,10 @@
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -5501,16 +5541,16 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "[CACHE]/builder/src/out/host_debug_unopt/gen/flutter/lib/snapshot/vm_isolate_snapshot.bin",
+      "[CACHE]/builder/engine/src/out/host_debug_unopt/gen/flutter/lib/snapshot/vm_isolate_snapshot.bin",
       "[CACHE]/builder/flutter/bin/cache/artifacts/engine/linux-x64/vm_isolate_snapshot.bin"
     ],
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -5530,10 +5570,10 @@
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -5548,16 +5588,16 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "[CACHE]/builder/src/out/host_debug_unopt/gen/frontend_server.dart.snapshot",
+      "[CACHE]/builder/engine/src/out/host_debug_unopt/gen/frontend_server.dart.snapshot",
       "[CACHE]/builder/flutter/bin/cache/artifacts/engine/linux-x64/frontend_server.dart.snapshot"
     ],
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -5577,10 +5617,10 @@
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -5595,16 +5635,16 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "[CACHE]/builder/src/out/host_debug_unopt/gen/const_finder.dart.snapshot",
+      "[CACHE]/builder/engine/src/out/host_debug_unopt/gen/const_finder.dart.snapshot",
       "[CACHE]/builder/flutter/bin/cache/artifacts/engine/linux-x64/const_finder.dart.snapshot"
     ],
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -5626,10 +5666,10 @@
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -5649,10 +5689,10 @@
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -5667,16 +5707,16 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "[CACHE]/builder/src/out/android_profile/clang_x64/gen_snapshot",
+      "[CACHE]/builder/engine/src/out/android_profile/clang_x64/gen_snapshot",
       "[CACHE]/builder/flutter/bin/cache/artifacts/engine/android-arm-profile/linux-x64/gen_snapshot"
     ],
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -5698,10 +5738,10 @@
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -5721,10 +5761,10 @@
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -5739,16 +5779,16 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "[CACHE]/builder/src/out/android_release/clang_x64/gen_snapshot",
+      "[CACHE]/builder/engine/src/out/android_release/clang_x64/gen_snapshot",
       "[CACHE]/builder/flutter/bin/cache/artifacts/engine/android-arm-release/linux-x64/gen_snapshot"
     ],
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -5770,10 +5810,10 @@
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -5793,10 +5833,10 @@
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -5811,16 +5851,16 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "[CACHE]/builder/src/out/android_profile_arm64/clang_x64/gen_snapshot",
+      "[CACHE]/builder/engine/src/out/android_profile_arm64/clang_x64/gen_snapshot",
       "[CACHE]/builder/flutter/bin/cache/artifacts/engine/android-arm64-profile/linux-x64/gen_snapshot"
     ],
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -5842,10 +5882,10 @@
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -5865,10 +5905,10 @@
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -5883,16 +5923,16 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "[CACHE]/builder/src/out/android_release_arm64/clang_x64/gen_snapshot",
+      "[CACHE]/builder/engine/src/out/android_release_arm64/clang_x64/gen_snapshot",
       "[CACHE]/builder/flutter/bin/cache/artifacts/engine/android-arm64-release/linux-x64/gen_snapshot"
     ],
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -5914,10 +5954,10 @@
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -5937,10 +5977,10 @@
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -5955,16 +5995,16 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "[CACHE]/builder/src/out/android_profile_x64/clang_x64/gen_snapshot",
+      "[CACHE]/builder/engine/src/out/android_profile_x64/clang_x64/gen_snapshot",
       "[CACHE]/builder/flutter/bin/cache/artifacts/engine/android-x64-profile/linux-x64/gen_snapshot"
     ],
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -5986,10 +6026,10 @@
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -6009,10 +6049,10 @@
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -6027,16 +6067,16 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "[CACHE]/builder/src/out/android_release_x64/clang_x64/gen_snapshot",
+      "[CACHE]/builder/engine/src/out/android_release_x64/clang_x64/gen_snapshot",
       "[CACHE]/builder/flutter/bin/cache/artifacts/engine/android-x64-release/linux-x64/gen_snapshot"
     ],
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -6052,10 +6092,10 @@
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -6070,10 +6110,10 @@
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -6088,10 +6128,10 @@
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -6106,10 +6146,10 @@
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -6123,16 +6163,16 @@
       "--json-output",
       "/path/to/tmp/json",
       "copytree",
-      "[CACHE]/builder/src/out/host_debug/dart-sdk",
+      "[CACHE]/builder/engine/src/out/host_debug/dart-sdk",
       "[CACHE]/builder/flutter/bin/cache/dart-sdk"
     ],
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -6147,16 +6187,16 @@
       "--json-output",
       "/path/to/tmp/json",
       "symlink",
-      "[CACHE]/builder/src/out/host_debug/gen/dart-pkg",
+      "[CACHE]/builder/engine/src/out/host_debug/gen/dart-pkg",
       "[CACHE]/builder/flutter/bin/cache/pkg"
     ],
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -6171,16 +6211,16 @@
       "--json-output",
       "/path/to/tmp/json",
       "symlink",
-      "[CACHE]/builder/src/out/host_debug/flutter_patched_sdk",
+      "[CACHE]/builder/engine/src/out/host_debug/flutter_patched_sdk",
       "[CACHE]/builder/flutter/bin/cache/artifacts/engine/common/flutter_patched_sdk"
     ],
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -6195,16 +6235,16 @@
       "--json-output",
       "/path/to/tmp/json",
       "symlink",
-      "[CACHE]/builder/src/out/host_release/flutter_patched_sdk",
+      "[CACHE]/builder/engine/src/out/host_release/flutter_patched_sdk",
       "[CACHE]/builder/flutter/bin/cache/artifacts/engine/common/flutter_patched_sdk_product"
     ],
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -6220,10 +6260,10 @@
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -6234,15 +6274,15 @@
       "[CACHE]/builder/flutter/bin/flutter",
       "update-packages",
       "--local-engine=host_debug",
-      "--local-engine-src-path=[CACHE]/builder/src"
+      "--local-engine-src-path=[CACHE]/builder/engine/src"
     ],
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -6254,15 +6294,15 @@
       "--enable-asserts",
       "dev/bots/analyze.dart",
       "--dart-sdk",
-      "[CACHE]/builder/src/out/host_debug/dart-sdk"
+      "[CACHE]/builder/engine/src/out/host_debug/dart-sdk"
     ],
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -6271,19 +6311,19 @@
   },
   {
     "cmd": [
-      "[CACHE]/builder/src/flutter/lib/web_ui/dev/web_engine_analysis.sh"
+      "[CACHE]/builder/engine/src/flutter/lib/web_ui/dev/web_engine_analysis.sh"
     ],
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "ENGINE_PATH": "[CACHE]/builder",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16",
-      "WEB_UI_DIR": "[CACHE]/builder/src/flutter/lib/web_ui"
+      "WEB_UI_DIR": "[CACHE]/builder/engine/src/flutter/lib/web_ui"
     },
     "name": "flutter web engine analyze",
     "timeout": 1200
@@ -6293,15 +6333,15 @@
       "dart",
       "dev/bots/test.dart",
       "--local-engine=host_debug",
-      "--local-engine-src-path=[CACHE]/builder/src"
+      "--local-engine-src-path=[CACHE]/builder/engine/src"
     ],
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "SHARD": "web_tests",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
@@ -6313,7 +6353,7 @@
     "cmd": [
       "python",
       "-u",
-      "[CACHE]/builder/src/third_party/dart/tools/task_kill.py"
+      "[CACHE]/builder/engine/src/third_party/dart/tools/task_kill.py"
     ],
     "name": "kill processes (2)"
   },
diff --git a/recipes/dart/flutter_engine.expected/run-all-test-suites.json b/recipes/dart/flutter_engine.expected/run-all-test-suites.json
index ef0337e..21b0c47 100644
--- a/recipes/dart/flutter_engine.expected/run-all-test-suites.json
+++ b/recipes/dart/flutter_engine.expected/run-all-test-suites.json
@@ -9,12 +9,26 @@
       "rmcontents",
       "[CACHE]/builder"
     ],
-    "cwd": "[CACHE]/builder",
     "infra_step": true,
     "name": "everything"
   },
   {
     "cmd": [
+      "vpython",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "ensure-directory",
+      "--mode",
+      "0777",
+      "[CACHE]/builder/engine"
+    ],
+    "infra_step": true,
+    "name": "mkdir engine"
+  },
+  {
+    "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[depot_tools::gitiles]/resources/gerrit_client.py",
@@ -25,7 +39,7 @@
       "--format",
       "text"
     ],
-    "cwd": "[CACHE]/builder",
+    "cwd": "[CACHE]/builder/engine",
     "name": "fetch ffffffff:commits.json"
   },
   {
@@ -34,7 +48,7 @@
       "-u",
       "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
       "--spec-path",
-      "cache_dir = '[CACHE]/git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'src/flutter', 'url': 'https://dart.googlesource.com/external/github.com/flutter/engine'}, {'deps_file': '.DEPS.git', 'managed': True, 'name': 'flutter', 'url': 'https://dart.googlesource.com/external/github.com/flutter/flutter'}]\ntarget_os = ['android']",
+      "cache_dir = '[CACHE]/git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'src/flutter', 'url': 'https://dart.googlesource.com/external/github.com/flutter/engine'}, {'deps_file': '.DEPS.git', 'managed': True, 'name': '../flutter', 'url': 'https://dart.googlesource.com/external/github.com/flutter/flutter'}]\ntarget_os = ['android']",
       "--revision_mapping_file",
       "{}",
       "--git-cache-dir",
@@ -44,13 +58,13 @@
       "--output_json",
       "/path/to/tmp/json",
       "--revision",
-      "flutter@HEAD",
+      "../flutter@HEAD",
       "--revision",
       "src/flutter@bar",
       "--revision",
       "src/third_party/dart@foo"
     ],
-    "cwd": "[CACHE]/builder",
+    "cwd": "[CACHE]/builder/engine",
     "env": {
       "GIT_HTTP_LOW_SPEED_LIMIT": "102400",
       "GIT_HTTP_LOW_SPEED_TIME": "300"
@@ -70,14 +84,14 @@
       "@@@STEP_LOG_LINE@json.output@{@@@",
       "@@@STEP_LOG_LINE@json.output@  \"did_run\": true, @@@",
       "@@@STEP_LOG_LINE@json.output@  \"fixed_revisions\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"flutter\": \"HEAD\", @@@",
+      "@@@STEP_LOG_LINE@json.output@    \"../flutter\": \"HEAD\", @@@",
       "@@@STEP_LOG_LINE@json.output@    \"src/flutter\": \"bar\", @@@",
       "@@@STEP_LOG_LINE@json.output@    \"src/third_party/dart\": \"foo\"@@@",
       "@@@STEP_LOG_LINE@json.output@  }, @@@",
       "@@@STEP_LOG_LINE@json.output@  \"manifest\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"flutter\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@      \"repository\": \"https://fake.org/flutter.git\", @@@",
-      "@@@STEP_LOG_LINE@json.output@      \"revision\": \"ff25d17873bba4bc564d8c7217280aa254ed4541\"@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"../flutter\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@      \"repository\": \"https://fake.org/../flutter.git\", @@@",
+      "@@@STEP_LOG_LINE@json.output@      \"revision\": \"ecd9a748968d17ba8524a1801b503f35c40a8f05\"@@@",
       "@@@STEP_LOG_LINE@json.output@    }, @@@",
       "@@@STEP_LOG_LINE@json.output@    \"src/flutter\": {@@@",
       "@@@STEP_LOG_LINE@json.output@      \"repository\": \"https://fake.org/src/flutter.git\", @@@",
@@ -94,10 +108,10 @@
       "@@@STEP_LOG_LINE@json.output@  \"root\": \"src/flutter\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"source_manifest\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"directories\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@      \"flutter\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@      \"../flutter\": {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"git_checkout\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@          \"repo_url\": \"https://fake.org/flutter.git\", @@@",
-      "@@@STEP_LOG_LINE@json.output@          \"revision\": \"ff25d17873bba4bc564d8c7217280aa254ed4541\"@@@",
+      "@@@STEP_LOG_LINE@json.output@          \"repo_url\": \"https://fake.org/../flutter.git\", @@@",
+      "@@@STEP_LOG_LINE@json.output@          \"revision\": \"ecd9a748968d17ba8524a1801b503f35c40a8f05\"@@@",
       "@@@STEP_LOG_LINE@json.output@        }@@@",
       "@@@STEP_LOG_LINE@json.output@      }, @@@",
       "@@@STEP_LOG_LINE@json.output@      \"src/flutter\": {@@@",
@@ -131,7 +145,7 @@
       "RECIPE_REPO[depot_tools]/gclient.py",
       "runhooks"
     ],
-    "cwd": "[CACHE]/builder",
+    "cwd": "[CACHE]/builder/engine",
     "env_suffixes": {
       "PATH": [
         "RECIPE_REPO[depot_tools]"
@@ -141,9 +155,35 @@
   },
   {
     "cmd": [
-      "src/third_party/dart/tools/3xhead_flutter_hooks.sh"
+      "vpython",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "symlink",
+      "[CACHE]/builder/flutter",
+      "[CACHE]/builder/engine/flutter"
     ],
-    "cwd": "[CACHE]/builder",
+    "cwd": "[CACHE]/builder/engine",
+    "env": {
+      "DEPOT_TOOLS_UPDATE": "0"
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "name": "symlink flutter to new checkout location"
+  },
+  {
+    "cmd": [
+      "[CACHE]/builder/engine/src/third_party/dart/tools/3xhead_flutter_hooks.sh"
+    ],
+    "cwd": "[CACHE]/builder/engine",
     "env": {
       "DEPOT_TOOLS_UPDATE": "0"
     },
@@ -225,7 +265,7 @@
     "cmd": [
       "python",
       "-u",
-      "[CACHE]/builder/src/third_party/dart/tools/task_kill.py"
+      "[CACHE]/builder/engine/src/third_party/dart/tools/task_kill.py"
     ],
     "name": "kill processes"
   },
@@ -238,20 +278,20 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "name": "accept android licenses"
   },
   {
     "cmd": [
-      "[CACHE]/builder/src/flutter/tools/gn",
+      "[CACHE]/builder/engine/src/flutter/tools/gn",
       "--full-dart-sdk"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "env_suffixes": {
@@ -283,7 +323,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "infra_step": true,
@@ -302,7 +342,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -347,7 +387,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "infra_step": true,
@@ -362,12 +402,12 @@
       "-j",
       "80",
       "-C",
-      "[CACHE]/builder/src/out/host_debug"
+      "[CACHE]/builder/engine/src/out/host_debug"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "name": "build host_debug"
@@ -387,7 +427,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -423,7 +463,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -448,7 +488,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -506,7 +546,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "name": "postprocess_for_goma.upload_log",
@@ -537,7 +577,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "infra_step": true,
@@ -565,7 +605,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "infra_step": true,
@@ -584,7 +624,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -629,7 +669,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "infra_step": true,
@@ -644,13 +684,13 @@
       "-j",
       "80",
       "-C",
-      "[CACHE]/builder/src/out/host_debug",
+      "[CACHE]/builder/engine/src/out/host_debug",
       "create_full_sdk"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "name": "build host_debug create_full_sdk"
@@ -670,7 +710,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -706,7 +746,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -731,7 +771,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -789,7 +829,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "name": "postprocess_for_goma (2).upload_log",
@@ -820,7 +860,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "infra_step": true,
@@ -831,13 +871,13 @@
   },
   {
     "cmd": [
-      "[CACHE]/builder/src/flutter/tools/gn",
+      "[CACHE]/builder/engine/src/flutter/tools/gn",
       "--unoptimized"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "env_suffixes": {
@@ -869,7 +909,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "infra_step": true,
@@ -888,7 +928,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -933,7 +973,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "infra_step": true,
@@ -948,12 +988,12 @@
       "-j",
       "80",
       "-C",
-      "[CACHE]/builder/src/out/host_debug_unopt"
+      "[CACHE]/builder/engine/src/out/host_debug_unopt"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "name": "build host_debug_unopt"
@@ -973,7 +1013,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -1009,7 +1049,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -1034,7 +1074,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -1092,7 +1132,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "name": "postprocess_for_goma (3).upload_log",
@@ -1123,7 +1163,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "infra_step": true,
@@ -1151,7 +1191,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "infra_step": true,
@@ -1170,7 +1210,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -1215,7 +1255,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "infra_step": true,
@@ -1230,13 +1270,13 @@
       "-j",
       "80",
       "-C",
-      "[CACHE]/builder/src/out/host_debug_unopt",
+      "[CACHE]/builder/engine/src/out/host_debug_unopt",
       "generate_dart_ui"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "name": "build host_debug_unopt generate_dart_ui"
@@ -1256,7 +1296,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -1292,7 +1332,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -1317,7 +1357,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -1375,7 +1415,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "name": "postprocess_for_goma (4).upload_log",
@@ -1406,7 +1446,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "infra_step": true,
@@ -1417,13 +1457,13 @@
   },
   {
     "cmd": [
-      "[CACHE]/builder/src/flutter/tools/gn",
+      "[CACHE]/builder/engine/src/flutter/tools/gn",
       "--runtime-mode=release"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "env_suffixes": {
@@ -1455,7 +1495,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "infra_step": true,
@@ -1474,7 +1514,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -1519,7 +1559,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "infra_step": true,
@@ -1534,12 +1574,12 @@
       "-j",
       "80",
       "-C",
-      "[CACHE]/builder/src/out/host_release"
+      "[CACHE]/builder/engine/src/out/host_release"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "name": "build host_release"
@@ -1559,7 +1599,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -1595,7 +1635,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -1620,7 +1660,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -1678,7 +1718,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "name": "postprocess_for_goma (5).upload_log",
@@ -1709,7 +1749,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "infra_step": true,
@@ -1720,7 +1760,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/builder/src/flutter/tools/gn",
+      "[CACHE]/builder/engine/src/flutter/tools/gn",
       "--fuchsia",
       "--fuchsia-cpu",
       "x64",
@@ -1730,7 +1770,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "env_suffixes": {
@@ -1762,7 +1802,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "infra_step": true,
@@ -1781,7 +1821,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -1826,7 +1866,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "infra_step": true,
@@ -1841,14 +1881,14 @@
       "-j",
       "80",
       "-C",
-      "[CACHE]/builder/src/out/fuchsia_debug_x64",
+      "[CACHE]/builder/engine/src/out/fuchsia_debug_x64",
       "flutter/shell/platform/fuchsia:fuchsia",
       "fuchsia_tests"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "name": "build fuchsia_debug_x64 flutter/shell/platform/fuchsia:fuchsia fuchsia_tests"
@@ -1868,7 +1908,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -1904,7 +1944,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -1929,7 +1969,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -1987,7 +2027,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "name": "postprocess_for_goma (6).upload_log",
@@ -2018,7 +2058,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "infra_step": true,
@@ -2037,12 +2077,12 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/builder/src/flutter/third_party/browsers/chrome"
+      "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "infra_step": true,
@@ -2053,7 +2093,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/builder/src/flutter/third_party/browsers/chrome",
+      "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome",
       "-ensure-file",
       "dart/browsers/chrome/${platform} version:84",
       "-max-threads",
@@ -2064,7 +2104,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "name": "ensure_installed",
@@ -2087,12 +2127,12 @@
       "/bin/bash",
       "flutter/ci/analyze.sh"
     ],
-    "cwd": "[CACHE]/builder/src",
+    "cwd": "[CACHE]/builder/engine/src",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "env_suffixes": {
       "DEPOT_TOOLS_UPDATE": [
@@ -2109,12 +2149,12 @@
       "/bin/bash",
       "flutter/testing/run_tests.sh"
     ],
-    "cwd": "[CACHE]/builder/src",
+    "cwd": "[CACHE]/builder/engine/src",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "env_suffixes": {
       "DEPOT_TOOLS_UPDATE": [
@@ -2129,32 +2169,32 @@
   {
     "cmd": [
       "dart",
-      "[CACHE]/builder/src/flutter/shell/testing/observatory/test.dart",
-      "[CACHE]/builder/src/out/host_debug/flutter_tester",
-      "[CACHE]/builder/src/flutter/shell/testing/observatory/empty_main.dart"
+      "[CACHE]/builder/engine/src/flutter/shell/testing/observatory/test.dart",
+      "[CACHE]/builder/engine/src/out/host_debug/flutter_tester",
+      "[CACHE]/builder/engine/src/flutter/shell/testing/observatory/empty_main.dart"
     ],
-    "cwd": "[CACHE]/builder/src",
+    "cwd": "[CACHE]/builder/engine/src",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "test observatory and service protocol",
     "timeout": 300
   },
   {
     "cmd": [
-      "[CACHE]/builder/src/flutter/tools/gn",
+      "[CACHE]/builder/engine/src/flutter/tools/gn",
       "--android",
       "--no-lto"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "env_suffixes": {
       "DEPOT_TOOLS_UPDATE": [
@@ -2185,9 +2225,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "preprocess_for_goma (7).goma cache directory",
@@ -2205,7 +2245,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -2214,7 +2254,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "preprocess_for_goma (7).start_goma",
@@ -2251,9 +2291,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "preprocess_for_goma (7).start cloudtail",
@@ -2267,14 +2307,14 @@
       "-j",
       "80",
       "-C",
-      "[CACHE]/builder/src/out/android_debug"
+      "[CACHE]/builder/engine/src/out/android_debug"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "build android_debug"
   },
@@ -2293,7 +2333,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -2302,7 +2342,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (7).goma_jsonstatus",
     "~followup_annotations": [
@@ -2330,7 +2370,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -2339,7 +2379,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (7).goma_stat",
     "~followup_annotations": [
@@ -2356,7 +2396,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -2365,7 +2405,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (7).stop_goma",
     "~followup_annotations": [
@@ -2415,9 +2455,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (7).upload_log",
     "timeout": 300,
@@ -2447,9 +2487,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "postprocess_for_goma (7).stop cloudtail",
@@ -2476,9 +2516,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "preprocess_for_goma (8).goma cache directory",
@@ -2496,7 +2536,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -2505,7 +2545,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "preprocess_for_goma (8).start_goma",
@@ -2542,9 +2582,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "preprocess_for_goma (8).start cloudtail",
@@ -2558,15 +2598,15 @@
       "-j",
       "80",
       "-C",
-      "[CACHE]/builder/src/out/android_debug",
+      "[CACHE]/builder/engine/src/out/android_debug",
       ":dist"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "build android_debug :dist"
   },
@@ -2585,7 +2625,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -2594,7 +2634,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (8).goma_jsonstatus",
     "~followup_annotations": [
@@ -2622,7 +2662,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -2631,7 +2671,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (8).goma_stat",
     "~followup_annotations": [
@@ -2648,7 +2688,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -2657,7 +2697,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (8).stop_goma",
     "~followup_annotations": [
@@ -2707,9 +2747,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (8).upload_log",
     "timeout": 300,
@@ -2739,9 +2779,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "postprocess_for_goma (8).stop cloudtail",
@@ -2751,7 +2791,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/builder/src/flutter/tools/gn",
+      "[CACHE]/builder/engine/src/flutter/tools/gn",
       "--android",
       "--runtime-mode=profile",
       "--android-cpu=arm"
@@ -2759,9 +2799,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "env_suffixes": {
       "DEPOT_TOOLS_UPDATE": [
@@ -2792,9 +2832,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "preprocess_for_goma (9).goma cache directory",
@@ -2812,7 +2852,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -2821,7 +2861,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "preprocess_for_goma (9).start_goma",
@@ -2858,9 +2898,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "preprocess_for_goma (9).start cloudtail",
@@ -2874,14 +2914,14 @@
       "-j",
       "80",
       "-C",
-      "[CACHE]/builder/src/out/android_profile"
+      "[CACHE]/builder/engine/src/out/android_profile"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "build android_profile"
   },
@@ -2900,7 +2940,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -2909,7 +2949,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (9).goma_jsonstatus",
     "~followup_annotations": [
@@ -2937,7 +2977,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -2946,7 +2986,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (9).goma_stat",
     "~followup_annotations": [
@@ -2963,7 +3003,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -2972,7 +3012,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (9).stop_goma",
     "~followup_annotations": [
@@ -3022,9 +3062,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (9).upload_log",
     "timeout": 300,
@@ -3054,9 +3094,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "postprocess_for_goma (9).stop cloudtail",
@@ -3066,7 +3106,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/builder/src/flutter/tools/gn",
+      "[CACHE]/builder/engine/src/flutter/tools/gn",
       "--android",
       "--runtime-mode=release",
       "--android-cpu=arm"
@@ -3074,9 +3114,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "env_suffixes": {
       "DEPOT_TOOLS_UPDATE": [
@@ -3107,9 +3147,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "preprocess_for_goma (10).goma cache directory",
@@ -3127,7 +3167,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -3136,7 +3176,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "preprocess_for_goma (10).start_goma",
@@ -3173,9 +3213,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "preprocess_for_goma (10).start cloudtail",
@@ -3189,14 +3229,14 @@
       "-j",
       "80",
       "-C",
-      "[CACHE]/builder/src/out/android_release"
+      "[CACHE]/builder/engine/src/out/android_release"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "build android_release"
   },
@@ -3215,7 +3255,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -3224,7 +3264,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (10).goma_jsonstatus",
     "~followup_annotations": [
@@ -3252,7 +3292,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -3261,7 +3301,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (10).goma_stat",
     "~followup_annotations": [
@@ -3278,7 +3318,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -3287,7 +3327,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (10).stop_goma",
     "~followup_annotations": [
@@ -3337,9 +3377,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (10).upload_log",
     "timeout": 300,
@@ -3369,9 +3409,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "postprocess_for_goma (10).stop cloudtail",
@@ -3381,7 +3421,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/builder/src/flutter/tools/gn",
+      "[CACHE]/builder/engine/src/flutter/tools/gn",
       "--android",
       "--runtime-mode=profile",
       "--android-cpu=arm64"
@@ -3389,9 +3429,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "env_suffixes": {
       "DEPOT_TOOLS_UPDATE": [
@@ -3422,9 +3462,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "preprocess_for_goma (11).goma cache directory",
@@ -3442,7 +3482,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -3451,7 +3491,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "preprocess_for_goma (11).start_goma",
@@ -3488,9 +3528,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "preprocess_for_goma (11).start cloudtail",
@@ -3504,14 +3544,14 @@
       "-j",
       "80",
       "-C",
-      "[CACHE]/builder/src/out/android_profile_arm64"
+      "[CACHE]/builder/engine/src/out/android_profile_arm64"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "build android_profile_arm64"
   },
@@ -3530,7 +3570,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -3539,7 +3579,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (11).goma_jsonstatus",
     "~followup_annotations": [
@@ -3567,7 +3607,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -3576,7 +3616,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (11).goma_stat",
     "~followup_annotations": [
@@ -3593,7 +3633,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -3602,7 +3642,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (11).stop_goma",
     "~followup_annotations": [
@@ -3652,9 +3692,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (11).upload_log",
     "timeout": 300,
@@ -3684,9 +3724,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "postprocess_for_goma (11).stop cloudtail",
@@ -3696,7 +3736,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/builder/src/flutter/tools/gn",
+      "[CACHE]/builder/engine/src/flutter/tools/gn",
       "--android",
       "--runtime-mode=release",
       "--android-cpu=arm64"
@@ -3704,9 +3744,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "env_suffixes": {
       "DEPOT_TOOLS_UPDATE": [
@@ -3737,9 +3777,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "preprocess_for_goma (12).goma cache directory",
@@ -3757,7 +3797,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -3766,7 +3806,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "preprocess_for_goma (12).start_goma",
@@ -3803,9 +3843,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "preprocess_for_goma (12).start cloudtail",
@@ -3819,14 +3859,14 @@
       "-j",
       "80",
       "-C",
-      "[CACHE]/builder/src/out/android_release_arm64"
+      "[CACHE]/builder/engine/src/out/android_release_arm64"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "build android_release_arm64"
   },
@@ -3845,7 +3885,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -3854,7 +3894,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (12).goma_jsonstatus",
     "~followup_annotations": [
@@ -3882,7 +3922,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -3891,7 +3931,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (12).goma_stat",
     "~followup_annotations": [
@@ -3908,7 +3948,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -3917,7 +3957,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (12).stop_goma",
     "~followup_annotations": [
@@ -3967,9 +4007,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (12).upload_log",
     "timeout": 300,
@@ -3999,9 +4039,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "postprocess_for_goma (12).stop cloudtail",
@@ -4011,7 +4051,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/builder/src/flutter/tools/gn",
+      "[CACHE]/builder/engine/src/flutter/tools/gn",
       "--android",
       "--runtime-mode=profile",
       "--android-cpu=x64"
@@ -4019,9 +4059,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "env_suffixes": {
       "DEPOT_TOOLS_UPDATE": [
@@ -4052,9 +4092,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "preprocess_for_goma (13).goma cache directory",
@@ -4072,7 +4112,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -4081,7 +4121,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "preprocess_for_goma (13).start_goma",
@@ -4118,9 +4158,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "preprocess_for_goma (13).start cloudtail",
@@ -4134,14 +4174,14 @@
       "-j",
       "80",
       "-C",
-      "[CACHE]/builder/src/out/android_profile_x64"
+      "[CACHE]/builder/engine/src/out/android_profile_x64"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "build android_profile_x64"
   },
@@ -4160,7 +4200,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -4169,7 +4209,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (13).goma_jsonstatus",
     "~followup_annotations": [
@@ -4197,7 +4237,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -4206,7 +4246,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (13).goma_stat",
     "~followup_annotations": [
@@ -4223,7 +4263,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -4232,7 +4272,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (13).stop_goma",
     "~followup_annotations": [
@@ -4282,9 +4322,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (13).upload_log",
     "timeout": 300,
@@ -4314,9 +4354,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "postprocess_for_goma (13).stop cloudtail",
@@ -4326,7 +4366,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/builder/src/flutter/tools/gn",
+      "[CACHE]/builder/engine/src/flutter/tools/gn",
       "--android",
       "--runtime-mode=release",
       "--android-cpu=x64"
@@ -4334,9 +4374,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "env_suffixes": {
       "DEPOT_TOOLS_UPDATE": [
@@ -4367,9 +4407,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "preprocess_for_goma (14).goma cache directory",
@@ -4387,7 +4427,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -4396,7 +4436,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "preprocess_for_goma (14).start_goma",
@@ -4433,9 +4473,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "preprocess_for_goma (14).start cloudtail",
@@ -4449,14 +4489,14 @@
       "-j",
       "80",
       "-C",
-      "[CACHE]/builder/src/out/android_release_x64"
+      "[CACHE]/builder/engine/src/out/android_release_x64"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "build android_release_x64"
   },
@@ -4475,7 +4515,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -4484,7 +4524,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (14).goma_jsonstatus",
     "~followup_annotations": [
@@ -4512,7 +4552,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -4521,7 +4561,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (14).goma_stat",
     "~followup_annotations": [
@@ -4538,7 +4578,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -4547,7 +4587,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (14).stop_goma",
     "~followup_annotations": [
@@ -4597,9 +4637,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (14).upload_log",
     "timeout": 300,
@@ -4629,9 +4669,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "postprocess_for_goma (14).stop cloudtail",
@@ -4641,7 +4681,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/builder/src/flutter/tools/gn",
+      "[CACHE]/builder/engine/src/flutter/tools/gn",
       "--android",
       "--android-cpu=x64",
       "--no-lto"
@@ -4649,9 +4689,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "env_suffixes": {
       "DEPOT_TOOLS_UPDATE": [
@@ -4682,9 +4722,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "preprocess_for_goma (15).goma cache directory",
@@ -4702,7 +4742,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -4711,7 +4751,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "preprocess_for_goma (15).start_goma",
@@ -4748,9 +4788,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "preprocess_for_goma (15).start cloudtail",
@@ -4764,14 +4804,14 @@
       "-j",
       "80",
       "-C",
-      "[CACHE]/builder/src/out/android_debug_x64"
+      "[CACHE]/builder/engine/src/out/android_debug_x64"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "build android_debug_x64"
   },
@@ -4790,7 +4830,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -4799,7 +4839,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (15).goma_jsonstatus",
     "~followup_annotations": [
@@ -4827,7 +4867,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -4836,7 +4876,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (15).goma_stat",
     "~followup_annotations": [
@@ -4853,7 +4893,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -4862,7 +4902,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (15).stop_goma",
     "~followup_annotations": [
@@ -4912,9 +4952,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (15).upload_log",
     "timeout": 300,
@@ -4944,9 +4984,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "postprocess_for_goma (15).stop cloudtail",
@@ -4956,7 +4996,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/builder/src/flutter/tools/gn",
+      "[CACHE]/builder/engine/src/flutter/tools/gn",
       "--android",
       "--android-cpu=x86",
       "--no-lto"
@@ -4964,9 +5004,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "env_suffixes": {
       "DEPOT_TOOLS_UPDATE": [
@@ -4997,9 +5037,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "preprocess_for_goma (16).goma cache directory",
@@ -5017,7 +5057,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -5026,7 +5066,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "preprocess_for_goma (16).start_goma",
@@ -5063,9 +5103,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "preprocess_for_goma (16).start cloudtail",
@@ -5079,14 +5119,14 @@
       "-j",
       "80",
       "-C",
-      "[CACHE]/builder/src/out/android_debug_x86"
+      "[CACHE]/builder/engine/src/out/android_debug_x86"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "build android_debug_x86"
   },
@@ -5105,7 +5145,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -5114,7 +5154,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (16).goma_jsonstatus",
     "~followup_annotations": [
@@ -5142,7 +5182,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -5151,7 +5191,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (16).goma_stat",
     "~followup_annotations": [
@@ -5168,7 +5208,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -5177,7 +5217,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (16).stop_goma",
     "~followup_annotations": [
@@ -5227,9 +5267,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (16).upload_log",
     "timeout": 300,
@@ -5259,9 +5299,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "postprocess_for_goma (16).stop cloudtail",
@@ -5278,10 +5318,10 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -5295,10 +5335,10 @@
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -5319,10 +5359,10 @@
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -5342,10 +5382,10 @@
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -5360,16 +5400,16 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "[CACHE]/builder/src/third_party/icu/flutter/icudtl.dat",
+      "[CACHE]/builder/engine/src/third_party/icu/flutter/icudtl.dat",
       "[CACHE]/builder/flutter/bin/cache/artifacts/engine/linux-x64/icudtl.dat"
     ],
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -5389,10 +5429,10 @@
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -5407,16 +5447,16 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "[CACHE]/builder/src/out/host_debug_unopt/flutter_tester",
+      "[CACHE]/builder/engine/src/out/host_debug_unopt/flutter_tester",
       "[CACHE]/builder/flutter/bin/cache/artifacts/engine/linux-x64/flutter_tester"
     ],
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -5436,10 +5476,10 @@
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -5454,16 +5494,16 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "[CACHE]/builder/src/out/host_debug_unopt/gen/flutter/lib/snapshot/isolate_snapshot.bin",
+      "[CACHE]/builder/engine/src/out/host_debug_unopt/gen/flutter/lib/snapshot/isolate_snapshot.bin",
       "[CACHE]/builder/flutter/bin/cache/artifacts/engine/linux-x64/isolate_snapshot.bin"
     ],
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -5483,10 +5523,10 @@
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -5501,16 +5541,16 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "[CACHE]/builder/src/out/host_debug_unopt/gen/flutter/lib/snapshot/vm_isolate_snapshot.bin",
+      "[CACHE]/builder/engine/src/out/host_debug_unopt/gen/flutter/lib/snapshot/vm_isolate_snapshot.bin",
       "[CACHE]/builder/flutter/bin/cache/artifacts/engine/linux-x64/vm_isolate_snapshot.bin"
     ],
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -5530,10 +5570,10 @@
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -5548,16 +5588,16 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "[CACHE]/builder/src/out/host_debug_unopt/gen/frontend_server.dart.snapshot",
+      "[CACHE]/builder/engine/src/out/host_debug_unopt/gen/frontend_server.dart.snapshot",
       "[CACHE]/builder/flutter/bin/cache/artifacts/engine/linux-x64/frontend_server.dart.snapshot"
     ],
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -5577,10 +5617,10 @@
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -5595,16 +5635,16 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "[CACHE]/builder/src/out/host_debug_unopt/gen/const_finder.dart.snapshot",
+      "[CACHE]/builder/engine/src/out/host_debug_unopt/gen/const_finder.dart.snapshot",
       "[CACHE]/builder/flutter/bin/cache/artifacts/engine/linux-x64/const_finder.dart.snapshot"
     ],
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -5626,10 +5666,10 @@
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -5649,10 +5689,10 @@
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -5667,16 +5707,16 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "[CACHE]/builder/src/out/android_profile/clang_x64/gen_snapshot",
+      "[CACHE]/builder/engine/src/out/android_profile/clang_x64/gen_snapshot",
       "[CACHE]/builder/flutter/bin/cache/artifacts/engine/android-arm-profile/linux-x64/gen_snapshot"
     ],
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -5698,10 +5738,10 @@
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -5721,10 +5761,10 @@
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -5739,16 +5779,16 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "[CACHE]/builder/src/out/android_release/clang_x64/gen_snapshot",
+      "[CACHE]/builder/engine/src/out/android_release/clang_x64/gen_snapshot",
       "[CACHE]/builder/flutter/bin/cache/artifacts/engine/android-arm-release/linux-x64/gen_snapshot"
     ],
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -5770,10 +5810,10 @@
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -5793,10 +5833,10 @@
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -5811,16 +5851,16 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "[CACHE]/builder/src/out/android_profile_arm64/clang_x64/gen_snapshot",
+      "[CACHE]/builder/engine/src/out/android_profile_arm64/clang_x64/gen_snapshot",
       "[CACHE]/builder/flutter/bin/cache/artifacts/engine/android-arm64-profile/linux-x64/gen_snapshot"
     ],
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -5842,10 +5882,10 @@
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -5865,10 +5905,10 @@
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -5883,16 +5923,16 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "[CACHE]/builder/src/out/android_release_arm64/clang_x64/gen_snapshot",
+      "[CACHE]/builder/engine/src/out/android_release_arm64/clang_x64/gen_snapshot",
       "[CACHE]/builder/flutter/bin/cache/artifacts/engine/android-arm64-release/linux-x64/gen_snapshot"
     ],
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -5914,10 +5954,10 @@
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -5937,10 +5977,10 @@
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -5955,16 +5995,16 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "[CACHE]/builder/src/out/android_profile_x64/clang_x64/gen_snapshot",
+      "[CACHE]/builder/engine/src/out/android_profile_x64/clang_x64/gen_snapshot",
       "[CACHE]/builder/flutter/bin/cache/artifacts/engine/android-x64-profile/linux-x64/gen_snapshot"
     ],
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -5986,10 +6026,10 @@
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -6009,10 +6049,10 @@
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -6027,16 +6067,16 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "[CACHE]/builder/src/out/android_release_x64/clang_x64/gen_snapshot",
+      "[CACHE]/builder/engine/src/out/android_release_x64/clang_x64/gen_snapshot",
       "[CACHE]/builder/flutter/bin/cache/artifacts/engine/android-x64-release/linux-x64/gen_snapshot"
     ],
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -6052,10 +6092,10 @@
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -6070,10 +6110,10 @@
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -6088,10 +6128,10 @@
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -6106,10 +6146,10 @@
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -6123,16 +6163,16 @@
       "--json-output",
       "/path/to/tmp/json",
       "copytree",
-      "[CACHE]/builder/src/out/host_debug/dart-sdk",
+      "[CACHE]/builder/engine/src/out/host_debug/dart-sdk",
       "[CACHE]/builder/flutter/bin/cache/dart-sdk"
     ],
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -6147,16 +6187,16 @@
       "--json-output",
       "/path/to/tmp/json",
       "symlink",
-      "[CACHE]/builder/src/out/host_debug/gen/dart-pkg",
+      "[CACHE]/builder/engine/src/out/host_debug/gen/dart-pkg",
       "[CACHE]/builder/flutter/bin/cache/pkg"
     ],
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -6171,16 +6211,16 @@
       "--json-output",
       "/path/to/tmp/json",
       "symlink",
-      "[CACHE]/builder/src/out/host_debug/flutter_patched_sdk",
+      "[CACHE]/builder/engine/src/out/host_debug/flutter_patched_sdk",
       "[CACHE]/builder/flutter/bin/cache/artifacts/engine/common/flutter_patched_sdk"
     ],
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -6195,16 +6235,16 @@
       "--json-output",
       "/path/to/tmp/json",
       "symlink",
-      "[CACHE]/builder/src/out/host_release/flutter_patched_sdk",
+      "[CACHE]/builder/engine/src/out/host_release/flutter_patched_sdk",
       "[CACHE]/builder/flutter/bin/cache/artifacts/engine/common/flutter_patched_sdk_product"
     ],
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -6220,10 +6260,10 @@
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -6234,15 +6274,15 @@
       "[CACHE]/builder/flutter/bin/flutter",
       "update-packages",
       "--local-engine=host_debug",
-      "--local-engine-src-path=[CACHE]/builder/src"
+      "--local-engine-src-path=[CACHE]/builder/engine/src"
     ],
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -6254,15 +6294,15 @@
       "--enable-asserts",
       "dev/bots/analyze.dart",
       "--dart-sdk",
-      "[CACHE]/builder/src/out/host_debug/dart-sdk"
+      "[CACHE]/builder/engine/src/out/host_debug/dart-sdk"
     ],
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -6271,19 +6311,19 @@
   },
   {
     "cmd": [
-      "[CACHE]/builder/src/flutter/lib/web_ui/dev/web_engine_analysis.sh"
+      "[CACHE]/builder/engine/src/flutter/lib/web_ui/dev/web_engine_analysis.sh"
     ],
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "ENGINE_PATH": "[CACHE]/builder",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16",
-      "WEB_UI_DIR": "[CACHE]/builder/src/flutter/lib/web_ui"
+      "WEB_UI_DIR": "[CACHE]/builder/engine/src/flutter/lib/web_ui"
     },
     "name": "flutter web engine analyze",
     "timeout": 1200
@@ -6293,15 +6333,15 @@
       "dart",
       "dev/bots/test.dart",
       "--local-engine=host_debug",
-      "--local-engine-src-path=[CACHE]/builder/src"
+      "--local-engine-src-path=[CACHE]/builder/engine/src"
     ],
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "SHARD": "add_to_app_life_cycle_tests",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
@@ -6314,15 +6354,15 @@
       "dart",
       "dev/bots/test.dart",
       "--local-engine=host_debug",
-      "--local-engine-src-path=[CACHE]/builder/src"
+      "--local-engine-src-path=[CACHE]/builder/engine/src"
     ],
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "SHARD": "build_tests",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
@@ -6335,15 +6375,15 @@
       "dart",
       "dev/bots/test.dart",
       "--local-engine=host_debug",
-      "--local-engine-src-path=[CACHE]/builder/src"
+      "--local-engine-src-path=[CACHE]/builder/engine/src"
     ],
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "SHARD": "framework_coverage",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
@@ -6356,15 +6396,15 @@
       "dart",
       "dev/bots/test.dart",
       "--local-engine=host_debug",
-      "--local-engine-src-path=[CACHE]/builder/src"
+      "--local-engine-src-path=[CACHE]/builder/engine/src"
     ],
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "SHARD": "framework_tests",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
@@ -6377,15 +6417,15 @@
       "dart",
       "dev/bots/test.dart",
       "--local-engine=host_debug",
-      "--local-engine-src-path=[CACHE]/builder/src"
+      "--local-engine-src-path=[CACHE]/builder/engine/src"
     ],
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "SHARD": "tool_coverage",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
@@ -6398,15 +6438,15 @@
       "dart",
       "dev/bots/test.dart",
       "--local-engine=host_debug",
-      "--local-engine-src-path=[CACHE]/builder/src"
+      "--local-engine-src-path=[CACHE]/builder/engine/src"
     ],
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "SHARD": "tool_tests",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
@@ -6419,15 +6459,15 @@
       "dart",
       "dev/bots/test.dart",
       "--local-engine=host_debug",
-      "--local-engine-src-path=[CACHE]/builder/src"
+      "--local-engine-src-path=[CACHE]/builder/engine/src"
     ],
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "SHARD": "web_tool_tests",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
@@ -6440,15 +6480,15 @@
       "dart",
       "dev/bots/test.dart",
       "--local-engine=host_debug",
-      "--local-engine-src-path=[CACHE]/builder/src"
+      "--local-engine-src-path=[CACHE]/builder/engine/src"
     ],
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "SHARD": "web_tests",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
@@ -6460,7 +6500,7 @@
     "cmd": [
       "python",
       "-u",
-      "[CACHE]/builder/src/third_party/dart/tools/task_kill.py"
+      "[CACHE]/builder/engine/src/third_party/dart/tools/task_kill.py"
     ],
     "name": "kill processes (2)"
   },
diff --git a/recipes/dart/flutter_engine.expected/run-undefined-test-suite.json b/recipes/dart/flutter_engine.expected/run-undefined-test-suite.json
index 0bef829..f12d437 100644
--- a/recipes/dart/flutter_engine.expected/run-undefined-test-suite.json
+++ b/recipes/dart/flutter_engine.expected/run-undefined-test-suite.json
@@ -9,12 +9,26 @@
       "rmcontents",
       "[CACHE]/builder"
     ],
-    "cwd": "[CACHE]/builder",
     "infra_step": true,
     "name": "everything"
   },
   {
     "cmd": [
+      "vpython",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "ensure-directory",
+      "--mode",
+      "0777",
+      "[CACHE]/builder/engine"
+    ],
+    "infra_step": true,
+    "name": "mkdir engine"
+  },
+  {
+    "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[depot_tools::gitiles]/resources/gerrit_client.py",
@@ -25,7 +39,7 @@
       "--format",
       "text"
     ],
-    "cwd": "[CACHE]/builder",
+    "cwd": "[CACHE]/builder/engine",
     "name": "fetch ffffffff:commits.json"
   },
   {
@@ -34,7 +48,7 @@
       "-u",
       "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
       "--spec-path",
-      "cache_dir = '[CACHE]/git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'src/flutter', 'url': 'https://dart.googlesource.com/external/github.com/flutter/engine'}, {'deps_file': '.DEPS.git', 'managed': True, 'name': 'flutter', 'url': 'https://dart.googlesource.com/external/github.com/flutter/flutter'}]\ntarget_os = ['android']",
+      "cache_dir = '[CACHE]/git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'src/flutter', 'url': 'https://dart.googlesource.com/external/github.com/flutter/engine'}, {'deps_file': '.DEPS.git', 'managed': True, 'name': '../flutter', 'url': 'https://dart.googlesource.com/external/github.com/flutter/flutter'}]\ntarget_os = ['android']",
       "--revision_mapping_file",
       "{}",
       "--git-cache-dir",
@@ -44,13 +58,13 @@
       "--output_json",
       "/path/to/tmp/json",
       "--revision",
-      "flutter@HEAD",
+      "../flutter@HEAD",
       "--revision",
       "src/flutter@bar",
       "--revision",
       "src/third_party/dart@foo"
     ],
-    "cwd": "[CACHE]/builder",
+    "cwd": "[CACHE]/builder/engine",
     "env": {
       "GIT_HTTP_LOW_SPEED_LIMIT": "102400",
       "GIT_HTTP_LOW_SPEED_TIME": "300"
@@ -70,14 +84,14 @@
       "@@@STEP_LOG_LINE@json.output@{@@@",
       "@@@STEP_LOG_LINE@json.output@  \"did_run\": true, @@@",
       "@@@STEP_LOG_LINE@json.output@  \"fixed_revisions\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"flutter\": \"HEAD\", @@@",
+      "@@@STEP_LOG_LINE@json.output@    \"../flutter\": \"HEAD\", @@@",
       "@@@STEP_LOG_LINE@json.output@    \"src/flutter\": \"bar\", @@@",
       "@@@STEP_LOG_LINE@json.output@    \"src/third_party/dart\": \"foo\"@@@",
       "@@@STEP_LOG_LINE@json.output@  }, @@@",
       "@@@STEP_LOG_LINE@json.output@  \"manifest\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"flutter\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@      \"repository\": \"https://fake.org/flutter.git\", @@@",
-      "@@@STEP_LOG_LINE@json.output@      \"revision\": \"ff25d17873bba4bc564d8c7217280aa254ed4541\"@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"../flutter\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@      \"repository\": \"https://fake.org/../flutter.git\", @@@",
+      "@@@STEP_LOG_LINE@json.output@      \"revision\": \"ecd9a748968d17ba8524a1801b503f35c40a8f05\"@@@",
       "@@@STEP_LOG_LINE@json.output@    }, @@@",
       "@@@STEP_LOG_LINE@json.output@    \"src/flutter\": {@@@",
       "@@@STEP_LOG_LINE@json.output@      \"repository\": \"https://fake.org/src/flutter.git\", @@@",
@@ -94,10 +108,10 @@
       "@@@STEP_LOG_LINE@json.output@  \"root\": \"src/flutter\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"source_manifest\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"directories\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@      \"flutter\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@      \"../flutter\": {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"git_checkout\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@          \"repo_url\": \"https://fake.org/flutter.git\", @@@",
-      "@@@STEP_LOG_LINE@json.output@          \"revision\": \"ff25d17873bba4bc564d8c7217280aa254ed4541\"@@@",
+      "@@@STEP_LOG_LINE@json.output@          \"repo_url\": \"https://fake.org/../flutter.git\", @@@",
+      "@@@STEP_LOG_LINE@json.output@          \"revision\": \"ecd9a748968d17ba8524a1801b503f35c40a8f05\"@@@",
       "@@@STEP_LOG_LINE@json.output@        }@@@",
       "@@@STEP_LOG_LINE@json.output@      }, @@@",
       "@@@STEP_LOG_LINE@json.output@      \"src/flutter\": {@@@",
@@ -131,7 +145,7 @@
       "RECIPE_REPO[depot_tools]/gclient.py",
       "runhooks"
     ],
-    "cwd": "[CACHE]/builder",
+    "cwd": "[CACHE]/builder/engine",
     "env_suffixes": {
       "PATH": [
         "RECIPE_REPO[depot_tools]"
@@ -141,9 +155,35 @@
   },
   {
     "cmd": [
-      "src/third_party/dart/tools/3xhead_flutter_hooks.sh"
+      "vpython",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "symlink",
+      "[CACHE]/builder/flutter",
+      "[CACHE]/builder/engine/flutter"
     ],
-    "cwd": "[CACHE]/builder",
+    "cwd": "[CACHE]/builder/engine",
+    "env": {
+      "DEPOT_TOOLS_UPDATE": "0"
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "name": "symlink flutter to new checkout location"
+  },
+  {
+    "cmd": [
+      "[CACHE]/builder/engine/src/third_party/dart/tools/3xhead_flutter_hooks.sh"
+    ],
+    "cwd": "[CACHE]/builder/engine",
     "env": {
       "DEPOT_TOOLS_UPDATE": "0"
     },
@@ -225,7 +265,7 @@
     "cmd": [
       "python",
       "-u",
-      "[CACHE]/builder/src/third_party/dart/tools/task_kill.py"
+      "[CACHE]/builder/engine/src/third_party/dart/tools/task_kill.py"
     ],
     "name": "kill processes"
   },
@@ -238,20 +278,20 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "name": "accept android licenses"
   },
   {
     "cmd": [
-      "[CACHE]/builder/src/flutter/tools/gn",
+      "[CACHE]/builder/engine/src/flutter/tools/gn",
       "--full-dart-sdk"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "env_suffixes": {
@@ -283,7 +323,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "infra_step": true,
@@ -302,7 +342,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -347,7 +387,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "infra_step": true,
@@ -362,12 +402,12 @@
       "-j",
       "80",
       "-C",
-      "[CACHE]/builder/src/out/host_debug"
+      "[CACHE]/builder/engine/src/out/host_debug"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "name": "build host_debug"
@@ -387,7 +427,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -423,7 +463,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -448,7 +488,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -506,7 +546,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "name": "postprocess_for_goma.upload_log",
@@ -537,7 +577,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "infra_step": true,
@@ -565,7 +605,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "infra_step": true,
@@ -584,7 +624,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -629,7 +669,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "infra_step": true,
@@ -644,13 +684,13 @@
       "-j",
       "80",
       "-C",
-      "[CACHE]/builder/src/out/host_debug",
+      "[CACHE]/builder/engine/src/out/host_debug",
       "create_full_sdk"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "name": "build host_debug create_full_sdk"
@@ -670,7 +710,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -706,7 +746,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -731,7 +771,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -789,7 +829,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "name": "postprocess_for_goma (2).upload_log",
@@ -820,7 +860,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "infra_step": true,
@@ -831,13 +871,13 @@
   },
   {
     "cmd": [
-      "[CACHE]/builder/src/flutter/tools/gn",
+      "[CACHE]/builder/engine/src/flutter/tools/gn",
       "--unoptimized"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "env_suffixes": {
@@ -869,7 +909,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "infra_step": true,
@@ -888,7 +928,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -933,7 +973,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "infra_step": true,
@@ -948,12 +988,12 @@
       "-j",
       "80",
       "-C",
-      "[CACHE]/builder/src/out/host_debug_unopt"
+      "[CACHE]/builder/engine/src/out/host_debug_unopt"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "name": "build host_debug_unopt"
@@ -973,7 +1013,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -1009,7 +1049,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -1034,7 +1074,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -1092,7 +1132,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "name": "postprocess_for_goma (3).upload_log",
@@ -1123,7 +1163,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "infra_step": true,
@@ -1151,7 +1191,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "infra_step": true,
@@ -1170,7 +1210,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -1215,7 +1255,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "infra_step": true,
@@ -1230,13 +1270,13 @@
       "-j",
       "80",
       "-C",
-      "[CACHE]/builder/src/out/host_debug_unopt",
+      "[CACHE]/builder/engine/src/out/host_debug_unopt",
       "generate_dart_ui"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "name": "build host_debug_unopt generate_dart_ui"
@@ -1256,7 +1296,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -1292,7 +1332,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -1317,7 +1357,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -1375,7 +1415,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "name": "postprocess_for_goma (4).upload_log",
@@ -1406,7 +1446,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "infra_step": true,
@@ -1417,13 +1457,13 @@
   },
   {
     "cmd": [
-      "[CACHE]/builder/src/flutter/tools/gn",
+      "[CACHE]/builder/engine/src/flutter/tools/gn",
       "--runtime-mode=release"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "env_suffixes": {
@@ -1455,7 +1495,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "infra_step": true,
@@ -1474,7 +1514,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -1519,7 +1559,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "infra_step": true,
@@ -1534,12 +1574,12 @@
       "-j",
       "80",
       "-C",
-      "[CACHE]/builder/src/out/host_release"
+      "[CACHE]/builder/engine/src/out/host_release"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "name": "build host_release"
@@ -1559,7 +1599,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -1595,7 +1635,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -1620,7 +1660,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -1678,7 +1718,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "name": "postprocess_for_goma (5).upload_log",
@@ -1709,7 +1749,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "infra_step": true,
@@ -1720,7 +1760,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/builder/src/flutter/tools/gn",
+      "[CACHE]/builder/engine/src/flutter/tools/gn",
       "--fuchsia",
       "--fuchsia-cpu",
       "x64",
@@ -1730,7 +1770,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "env_suffixes": {
@@ -1762,7 +1802,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "infra_step": true,
@@ -1781,7 +1821,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -1826,7 +1866,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "infra_step": true,
@@ -1841,14 +1881,14 @@
       "-j",
       "80",
       "-C",
-      "[CACHE]/builder/src/out/fuchsia_debug_x64",
+      "[CACHE]/builder/engine/src/out/fuchsia_debug_x64",
       "flutter/shell/platform/fuchsia:fuchsia",
       "fuchsia_tests"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "name": "build fuchsia_debug_x64 flutter/shell/platform/fuchsia:fuchsia fuchsia_tests"
@@ -1868,7 +1908,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -1904,7 +1944,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -1929,7 +1969,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -1987,7 +2027,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "name": "postprocess_for_goma (6).upload_log",
@@ -2018,7 +2058,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "infra_step": true,
@@ -2037,12 +2077,12 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CACHE]/builder/src/flutter/third_party/browsers/chrome"
+      "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "infra_step": true,
@@ -2053,7 +2093,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/builder/src/flutter/third_party/browsers/chrome",
+      "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome",
       "-ensure-file",
       "dart/browsers/chrome/${platform} version:84",
       "-max-threads",
@@ -2064,7 +2104,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
     "name": "ensure_installed",
@@ -2087,12 +2127,12 @@
       "/bin/bash",
       "flutter/ci/analyze.sh"
     ],
-    "cwd": "[CACHE]/builder/src",
+    "cwd": "[CACHE]/builder/engine/src",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "env_suffixes": {
       "DEPOT_TOOLS_UPDATE": [
@@ -2109,12 +2149,12 @@
       "/bin/bash",
       "flutter/testing/run_tests.sh"
     ],
-    "cwd": "[CACHE]/builder/src",
+    "cwd": "[CACHE]/builder/engine/src",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "env_suffixes": {
       "DEPOT_TOOLS_UPDATE": [
@@ -2129,32 +2169,32 @@
   {
     "cmd": [
       "dart",
-      "[CACHE]/builder/src/flutter/shell/testing/observatory/test.dart",
-      "[CACHE]/builder/src/out/host_debug/flutter_tester",
-      "[CACHE]/builder/src/flutter/shell/testing/observatory/empty_main.dart"
+      "[CACHE]/builder/engine/src/flutter/shell/testing/observatory/test.dart",
+      "[CACHE]/builder/engine/src/out/host_debug/flutter_tester",
+      "[CACHE]/builder/engine/src/flutter/shell/testing/observatory/empty_main.dart"
     ],
-    "cwd": "[CACHE]/builder/src",
+    "cwd": "[CACHE]/builder/engine/src",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "test observatory and service protocol",
     "timeout": 300
   },
   {
     "cmd": [
-      "[CACHE]/builder/src/flutter/tools/gn",
+      "[CACHE]/builder/engine/src/flutter/tools/gn",
       "--android",
       "--no-lto"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "env_suffixes": {
       "DEPOT_TOOLS_UPDATE": [
@@ -2185,9 +2225,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "preprocess_for_goma (7).goma cache directory",
@@ -2205,7 +2245,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -2214,7 +2254,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "preprocess_for_goma (7).start_goma",
@@ -2251,9 +2291,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "preprocess_for_goma (7).start cloudtail",
@@ -2267,14 +2307,14 @@
       "-j",
       "80",
       "-C",
-      "[CACHE]/builder/src/out/android_debug"
+      "[CACHE]/builder/engine/src/out/android_debug"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "build android_debug"
   },
@@ -2293,7 +2333,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -2302,7 +2342,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (7).goma_jsonstatus",
     "~followup_annotations": [
@@ -2330,7 +2370,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -2339,7 +2379,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (7).goma_stat",
     "~followup_annotations": [
@@ -2356,7 +2396,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -2365,7 +2405,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (7).stop_goma",
     "~followup_annotations": [
@@ -2415,9 +2455,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (7).upload_log",
     "timeout": 300,
@@ -2447,9 +2487,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "postprocess_for_goma (7).stop cloudtail",
@@ -2476,9 +2516,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "preprocess_for_goma (8).goma cache directory",
@@ -2496,7 +2536,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -2505,7 +2545,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "preprocess_for_goma (8).start_goma",
@@ -2542,9 +2582,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "preprocess_for_goma (8).start cloudtail",
@@ -2558,15 +2598,15 @@
       "-j",
       "80",
       "-C",
-      "[CACHE]/builder/src/out/android_debug",
+      "[CACHE]/builder/engine/src/out/android_debug",
       ":dist"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "build android_debug :dist"
   },
@@ -2585,7 +2625,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -2594,7 +2634,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (8).goma_jsonstatus",
     "~followup_annotations": [
@@ -2622,7 +2662,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -2631,7 +2671,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (8).goma_stat",
     "~followup_annotations": [
@@ -2648,7 +2688,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -2657,7 +2697,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (8).stop_goma",
     "~followup_annotations": [
@@ -2707,9 +2747,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (8).upload_log",
     "timeout": 300,
@@ -2739,9 +2779,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "postprocess_for_goma (8).stop cloudtail",
@@ -2751,7 +2791,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/builder/src/flutter/tools/gn",
+      "[CACHE]/builder/engine/src/flutter/tools/gn",
       "--android",
       "--runtime-mode=profile",
       "--android-cpu=arm"
@@ -2759,9 +2799,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "env_suffixes": {
       "DEPOT_TOOLS_UPDATE": [
@@ -2792,9 +2832,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "preprocess_for_goma (9).goma cache directory",
@@ -2812,7 +2852,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -2821,7 +2861,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "preprocess_for_goma (9).start_goma",
@@ -2858,9 +2898,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "preprocess_for_goma (9).start cloudtail",
@@ -2874,14 +2914,14 @@
       "-j",
       "80",
       "-C",
-      "[CACHE]/builder/src/out/android_profile"
+      "[CACHE]/builder/engine/src/out/android_profile"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "build android_profile"
   },
@@ -2900,7 +2940,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -2909,7 +2949,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (9).goma_jsonstatus",
     "~followup_annotations": [
@@ -2937,7 +2977,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -2946,7 +2986,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (9).goma_stat",
     "~followup_annotations": [
@@ -2963,7 +3003,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -2972,7 +3012,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (9).stop_goma",
     "~followup_annotations": [
@@ -3022,9 +3062,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (9).upload_log",
     "timeout": 300,
@@ -3054,9 +3094,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "postprocess_for_goma (9).stop cloudtail",
@@ -3066,7 +3106,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/builder/src/flutter/tools/gn",
+      "[CACHE]/builder/engine/src/flutter/tools/gn",
       "--android",
       "--runtime-mode=release",
       "--android-cpu=arm"
@@ -3074,9 +3114,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "env_suffixes": {
       "DEPOT_TOOLS_UPDATE": [
@@ -3107,9 +3147,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "preprocess_for_goma (10).goma cache directory",
@@ -3127,7 +3167,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -3136,7 +3176,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "preprocess_for_goma (10).start_goma",
@@ -3173,9 +3213,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "preprocess_for_goma (10).start cloudtail",
@@ -3189,14 +3229,14 @@
       "-j",
       "80",
       "-C",
-      "[CACHE]/builder/src/out/android_release"
+      "[CACHE]/builder/engine/src/out/android_release"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "build android_release"
   },
@@ -3215,7 +3255,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -3224,7 +3264,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (10).goma_jsonstatus",
     "~followup_annotations": [
@@ -3252,7 +3292,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -3261,7 +3301,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (10).goma_stat",
     "~followup_annotations": [
@@ -3278,7 +3318,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -3287,7 +3327,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (10).stop_goma",
     "~followup_annotations": [
@@ -3337,9 +3377,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (10).upload_log",
     "timeout": 300,
@@ -3369,9 +3409,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "postprocess_for_goma (10).stop cloudtail",
@@ -3381,7 +3421,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/builder/src/flutter/tools/gn",
+      "[CACHE]/builder/engine/src/flutter/tools/gn",
       "--android",
       "--runtime-mode=profile",
       "--android-cpu=arm64"
@@ -3389,9 +3429,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "env_suffixes": {
       "DEPOT_TOOLS_UPDATE": [
@@ -3422,9 +3462,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "preprocess_for_goma (11).goma cache directory",
@@ -3442,7 +3482,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -3451,7 +3491,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "preprocess_for_goma (11).start_goma",
@@ -3488,9 +3528,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "preprocess_for_goma (11).start cloudtail",
@@ -3504,14 +3544,14 @@
       "-j",
       "80",
       "-C",
-      "[CACHE]/builder/src/out/android_profile_arm64"
+      "[CACHE]/builder/engine/src/out/android_profile_arm64"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "build android_profile_arm64"
   },
@@ -3530,7 +3570,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -3539,7 +3579,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (11).goma_jsonstatus",
     "~followup_annotations": [
@@ -3567,7 +3607,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -3576,7 +3616,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (11).goma_stat",
     "~followup_annotations": [
@@ -3593,7 +3633,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -3602,7 +3642,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (11).stop_goma",
     "~followup_annotations": [
@@ -3652,9 +3692,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (11).upload_log",
     "timeout": 300,
@@ -3684,9 +3724,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "postprocess_for_goma (11).stop cloudtail",
@@ -3696,7 +3736,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/builder/src/flutter/tools/gn",
+      "[CACHE]/builder/engine/src/flutter/tools/gn",
       "--android",
       "--runtime-mode=release",
       "--android-cpu=arm64"
@@ -3704,9 +3744,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "env_suffixes": {
       "DEPOT_TOOLS_UPDATE": [
@@ -3737,9 +3777,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "preprocess_for_goma (12).goma cache directory",
@@ -3757,7 +3797,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -3766,7 +3806,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "preprocess_for_goma (12).start_goma",
@@ -3803,9 +3843,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "preprocess_for_goma (12).start cloudtail",
@@ -3819,14 +3859,14 @@
       "-j",
       "80",
       "-C",
-      "[CACHE]/builder/src/out/android_release_arm64"
+      "[CACHE]/builder/engine/src/out/android_release_arm64"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "build android_release_arm64"
   },
@@ -3845,7 +3885,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -3854,7 +3894,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (12).goma_jsonstatus",
     "~followup_annotations": [
@@ -3882,7 +3922,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -3891,7 +3931,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (12).goma_stat",
     "~followup_annotations": [
@@ -3908,7 +3948,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -3917,7 +3957,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (12).stop_goma",
     "~followup_annotations": [
@@ -3967,9 +4007,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (12).upload_log",
     "timeout": 300,
@@ -3999,9 +4039,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "postprocess_for_goma (12).stop cloudtail",
@@ -4011,7 +4051,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/builder/src/flutter/tools/gn",
+      "[CACHE]/builder/engine/src/flutter/tools/gn",
       "--android",
       "--runtime-mode=profile",
       "--android-cpu=x64"
@@ -4019,9 +4059,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "env_suffixes": {
       "DEPOT_TOOLS_UPDATE": [
@@ -4052,9 +4092,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "preprocess_for_goma (13).goma cache directory",
@@ -4072,7 +4112,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -4081,7 +4121,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "preprocess_for_goma (13).start_goma",
@@ -4118,9 +4158,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "preprocess_for_goma (13).start cloudtail",
@@ -4134,14 +4174,14 @@
       "-j",
       "80",
       "-C",
-      "[CACHE]/builder/src/out/android_profile_x64"
+      "[CACHE]/builder/engine/src/out/android_profile_x64"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "build android_profile_x64"
   },
@@ -4160,7 +4200,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -4169,7 +4209,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (13).goma_jsonstatus",
     "~followup_annotations": [
@@ -4197,7 +4237,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -4206,7 +4246,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (13).goma_stat",
     "~followup_annotations": [
@@ -4223,7 +4263,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -4232,7 +4272,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (13).stop_goma",
     "~followup_annotations": [
@@ -4282,9 +4322,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (13).upload_log",
     "timeout": 300,
@@ -4314,9 +4354,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "postprocess_for_goma (13).stop cloudtail",
@@ -4326,7 +4366,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/builder/src/flutter/tools/gn",
+      "[CACHE]/builder/engine/src/flutter/tools/gn",
       "--android",
       "--runtime-mode=release",
       "--android-cpu=x64"
@@ -4334,9 +4374,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "env_suffixes": {
       "DEPOT_TOOLS_UPDATE": [
@@ -4367,9 +4407,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "preprocess_for_goma (14).goma cache directory",
@@ -4387,7 +4427,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -4396,7 +4436,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "preprocess_for_goma (14).start_goma",
@@ -4433,9 +4473,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "preprocess_for_goma (14).start cloudtail",
@@ -4449,14 +4489,14 @@
       "-j",
       "80",
       "-C",
-      "[CACHE]/builder/src/out/android_release_x64"
+      "[CACHE]/builder/engine/src/out/android_release_x64"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "build android_release_x64"
   },
@@ -4475,7 +4515,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -4484,7 +4524,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (14).goma_jsonstatus",
     "~followup_annotations": [
@@ -4512,7 +4552,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -4521,7 +4561,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (14).goma_stat",
     "~followup_annotations": [
@@ -4538,7 +4578,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -4547,7 +4587,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (14).stop_goma",
     "~followup_annotations": [
@@ -4597,9 +4637,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (14).upload_log",
     "timeout": 300,
@@ -4629,9 +4669,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "postprocess_for_goma (14).stop cloudtail",
@@ -4641,7 +4681,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/builder/src/flutter/tools/gn",
+      "[CACHE]/builder/engine/src/flutter/tools/gn",
       "--android",
       "--android-cpu=x64",
       "--no-lto"
@@ -4649,9 +4689,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "env_suffixes": {
       "DEPOT_TOOLS_UPDATE": [
@@ -4682,9 +4722,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "preprocess_for_goma (15).goma cache directory",
@@ -4702,7 +4742,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -4711,7 +4751,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "preprocess_for_goma (15).start_goma",
@@ -4748,9 +4788,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "preprocess_for_goma (15).start cloudtail",
@@ -4764,14 +4804,14 @@
       "-j",
       "80",
       "-C",
-      "[CACHE]/builder/src/out/android_debug_x64"
+      "[CACHE]/builder/engine/src/out/android_debug_x64"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "build android_debug_x64"
   },
@@ -4790,7 +4830,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -4799,7 +4839,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (15).goma_jsonstatus",
     "~followup_annotations": [
@@ -4827,7 +4867,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -4836,7 +4876,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (15).goma_stat",
     "~followup_annotations": [
@@ -4853,7 +4893,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -4862,7 +4902,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (15).stop_goma",
     "~followup_annotations": [
@@ -4912,9 +4952,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (15).upload_log",
     "timeout": 300,
@@ -4944,9 +4984,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "postprocess_for_goma (15).stop cloudtail",
@@ -4956,7 +4996,7 @@
   },
   {
     "cmd": [
-      "[CACHE]/builder/src/flutter/tools/gn",
+      "[CACHE]/builder/engine/src/flutter/tools/gn",
       "--android",
       "--android-cpu=x86",
       "--no-lto"
@@ -4964,9 +5004,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "env_suffixes": {
       "DEPOT_TOOLS_UPDATE": [
@@ -4997,9 +5037,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "preprocess_for_goma (16).goma cache directory",
@@ -5017,7 +5057,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -5026,7 +5066,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "preprocess_for_goma (16).start_goma",
@@ -5063,9 +5103,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "preprocess_for_goma (16).start cloudtail",
@@ -5079,14 +5119,14 @@
       "-j",
       "80",
       "-C",
-      "[CACHE]/builder/src/out/android_debug_x86"
+      "[CACHE]/builder/engine/src/out/android_debug_x86"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "build android_debug_x86"
   },
@@ -5105,7 +5145,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -5114,7 +5154,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (16).goma_jsonstatus",
     "~followup_annotations": [
@@ -5142,7 +5182,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -5151,7 +5191,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (16).goma_stat",
     "~followup_annotations": [
@@ -5168,7 +5208,7 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMACTL_CRASH_REPORT_ID_FILE": "[TMP_BASE]/crash_report_id",
       "GOMA_CACHE_DIR": "[CACHE]/goma/data/flutter_engine_linux",
       "GOMA_DIR": "[CACHE]/goma/client",
@@ -5177,7 +5217,7 @@
       "GOMA_ENABLE_COUNTERZ": "true",
       "GOMA_HERMETIC": "error",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (16).stop_goma",
     "~followup_annotations": [
@@ -5227,9 +5267,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "name": "postprocess_for_goma (16).upload_log",
     "timeout": 300,
@@ -5259,9 +5299,9 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
     "infra_step": true,
     "name": "postprocess_for_goma (16).stop cloudtail",
@@ -5278,10 +5318,10 @@
     "cwd": "[CACHE]/builder",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -5295,10 +5335,10 @@
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -5319,10 +5359,10 @@
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -5342,10 +5382,10 @@
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -5360,16 +5400,16 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "[CACHE]/builder/src/third_party/icu/flutter/icudtl.dat",
+      "[CACHE]/builder/engine/src/third_party/icu/flutter/icudtl.dat",
       "[CACHE]/builder/flutter/bin/cache/artifacts/engine/linux-x64/icudtl.dat"
     ],
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -5389,10 +5429,10 @@
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -5407,16 +5447,16 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "[CACHE]/builder/src/out/host_debug_unopt/flutter_tester",
+      "[CACHE]/builder/engine/src/out/host_debug_unopt/flutter_tester",
       "[CACHE]/builder/flutter/bin/cache/artifacts/engine/linux-x64/flutter_tester"
     ],
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -5436,10 +5476,10 @@
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -5454,16 +5494,16 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "[CACHE]/builder/src/out/host_debug_unopt/gen/flutter/lib/snapshot/isolate_snapshot.bin",
+      "[CACHE]/builder/engine/src/out/host_debug_unopt/gen/flutter/lib/snapshot/isolate_snapshot.bin",
       "[CACHE]/builder/flutter/bin/cache/artifacts/engine/linux-x64/isolate_snapshot.bin"
     ],
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -5483,10 +5523,10 @@
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -5501,16 +5541,16 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "[CACHE]/builder/src/out/host_debug_unopt/gen/flutter/lib/snapshot/vm_isolate_snapshot.bin",
+      "[CACHE]/builder/engine/src/out/host_debug_unopt/gen/flutter/lib/snapshot/vm_isolate_snapshot.bin",
       "[CACHE]/builder/flutter/bin/cache/artifacts/engine/linux-x64/vm_isolate_snapshot.bin"
     ],
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -5530,10 +5570,10 @@
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -5548,16 +5588,16 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "[CACHE]/builder/src/out/host_debug_unopt/gen/frontend_server.dart.snapshot",
+      "[CACHE]/builder/engine/src/out/host_debug_unopt/gen/frontend_server.dart.snapshot",
       "[CACHE]/builder/flutter/bin/cache/artifacts/engine/linux-x64/frontend_server.dart.snapshot"
     ],
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -5577,10 +5617,10 @@
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -5595,16 +5635,16 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "[CACHE]/builder/src/out/host_debug_unopt/gen/const_finder.dart.snapshot",
+      "[CACHE]/builder/engine/src/out/host_debug_unopt/gen/const_finder.dart.snapshot",
       "[CACHE]/builder/flutter/bin/cache/artifacts/engine/linux-x64/const_finder.dart.snapshot"
     ],
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -5626,10 +5666,10 @@
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -5649,10 +5689,10 @@
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -5667,16 +5707,16 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "[CACHE]/builder/src/out/android_profile/clang_x64/gen_snapshot",
+      "[CACHE]/builder/engine/src/out/android_profile/clang_x64/gen_snapshot",
       "[CACHE]/builder/flutter/bin/cache/artifacts/engine/android-arm-profile/linux-x64/gen_snapshot"
     ],
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -5698,10 +5738,10 @@
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -5721,10 +5761,10 @@
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -5739,16 +5779,16 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "[CACHE]/builder/src/out/android_release/clang_x64/gen_snapshot",
+      "[CACHE]/builder/engine/src/out/android_release/clang_x64/gen_snapshot",
       "[CACHE]/builder/flutter/bin/cache/artifacts/engine/android-arm-release/linux-x64/gen_snapshot"
     ],
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -5770,10 +5810,10 @@
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -5793,10 +5833,10 @@
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -5811,16 +5851,16 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "[CACHE]/builder/src/out/android_profile_arm64/clang_x64/gen_snapshot",
+      "[CACHE]/builder/engine/src/out/android_profile_arm64/clang_x64/gen_snapshot",
       "[CACHE]/builder/flutter/bin/cache/artifacts/engine/android-arm64-profile/linux-x64/gen_snapshot"
     ],
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -5842,10 +5882,10 @@
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -5865,10 +5905,10 @@
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -5883,16 +5923,16 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "[CACHE]/builder/src/out/android_release_arm64/clang_x64/gen_snapshot",
+      "[CACHE]/builder/engine/src/out/android_release_arm64/clang_x64/gen_snapshot",
       "[CACHE]/builder/flutter/bin/cache/artifacts/engine/android-arm64-release/linux-x64/gen_snapshot"
     ],
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -5914,10 +5954,10 @@
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -5937,10 +5977,10 @@
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -5955,16 +5995,16 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "[CACHE]/builder/src/out/android_profile_x64/clang_x64/gen_snapshot",
+      "[CACHE]/builder/engine/src/out/android_profile_x64/clang_x64/gen_snapshot",
       "[CACHE]/builder/flutter/bin/cache/artifacts/engine/android-x64-profile/linux-x64/gen_snapshot"
     ],
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -5986,10 +6026,10 @@
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -6009,10 +6049,10 @@
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -6027,16 +6067,16 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "[CACHE]/builder/src/out/android_release_x64/clang_x64/gen_snapshot",
+      "[CACHE]/builder/engine/src/out/android_release_x64/clang_x64/gen_snapshot",
       "[CACHE]/builder/flutter/bin/cache/artifacts/engine/android-x64-release/linux-x64/gen_snapshot"
     ],
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -6052,10 +6092,10 @@
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -6070,10 +6110,10 @@
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -6088,10 +6128,10 @@
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -6106,10 +6146,10 @@
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -6123,16 +6163,16 @@
       "--json-output",
       "/path/to/tmp/json",
       "copytree",
-      "[CACHE]/builder/src/out/host_debug/dart-sdk",
+      "[CACHE]/builder/engine/src/out/host_debug/dart-sdk",
       "[CACHE]/builder/flutter/bin/cache/dart-sdk"
     ],
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -6147,16 +6187,16 @@
       "--json-output",
       "/path/to/tmp/json",
       "symlink",
-      "[CACHE]/builder/src/out/host_debug/gen/dart-pkg",
+      "[CACHE]/builder/engine/src/out/host_debug/gen/dart-pkg",
       "[CACHE]/builder/flutter/bin/cache/pkg"
     ],
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -6171,16 +6211,16 @@
       "--json-output",
       "/path/to/tmp/json",
       "symlink",
-      "[CACHE]/builder/src/out/host_debug/flutter_patched_sdk",
+      "[CACHE]/builder/engine/src/out/host_debug/flutter_patched_sdk",
       "[CACHE]/builder/flutter/bin/cache/artifacts/engine/common/flutter_patched_sdk"
     ],
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -6195,16 +6235,16 @@
       "--json-output",
       "/path/to/tmp/json",
       "symlink",
-      "[CACHE]/builder/src/out/host_release/flutter_patched_sdk",
+      "[CACHE]/builder/engine/src/out/host_release/flutter_patched_sdk",
       "[CACHE]/builder/flutter/bin/cache/artifacts/engine/common/flutter_patched_sdk_product"
     ],
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -6220,10 +6260,10 @@
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -6234,15 +6274,15 @@
       "[CACHE]/builder/flutter/bin/flutter",
       "update-packages",
       "--local-engine=host_debug",
-      "--local-engine-src-path=[CACHE]/builder/src"
+      "--local-engine-src-path=[CACHE]/builder/engine/src"
     ],
     "cwd": "[CACHE]/builder/flutter",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "CHROME_EXECUTABLE": "[CACHE]/builder/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
       "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/src/out/host_debug/dart-sdk/bin:<PATH>",
+      "PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
       "TEST_COMMIT_RANGE": "HEAD",
       "WEB_SHARD_COUNT": "16"
     },
@@ -6278,7 +6318,7 @@
     "cmd": [
       "python",
       "-u",
-      "[CACHE]/builder/src/third_party/dart/tools/task_kill.py"
+      "[CACHE]/builder/engine/src/third_party/dart/tools/task_kill.py"
     ],
     "name": "kill processes (2)"
   },
diff --git a/recipes/dart/flutter_engine.expected/start-bisect.json b/recipes/dart/flutter_engine.expected/start-bisect.json
index ffb69e3..3eac476 100644
--- a/recipes/dart/flutter_engine.expected/start-bisect.json
+++ b/recipes/dart/flutter_engine.expected/start-bisect.json
@@ -9,7 +9,6 @@
       "rmcontents",
       "[CACHE]/builder"
     ],
-    "cwd": "[CACHE]/builder",
     "infra_step": true,
     "name": "everything",
     "~followup_annotations": [
@@ -224,7 +223,7 @@
     "cmd": [
       "python",
       "-u",
-      "[CACHE]/builder/src/third_party/dart/tools/task_kill.py"
+      "[CACHE]/builder/engine/src/third_party/dart/tools/task_kill.py"
     ],
     "name": "kill processes"
   },
diff --git a/recipes/dart/flutter_engine.py b/recipes/dart/flutter_engine.py
index 2c8547d..1d1c583 100644
--- a/recipes/dart/flutter_engine.py
+++ b/recipes/dart/flutter_engine.py
@@ -47,16 +47,16 @@
 LINEARIZED_REPO_URL = DART_GERRIT + LINEARIZED_REPO
 
 
-def KillTasks(api, checkout_dir, ok_ret='any'):
+def KillTasks(api, engine_src, ok_ret='any'):
   """Kills leftover tasks from previous runs or steps."""
-  dart_sdk_dir = checkout_dir.join('third_party', 'dart')
+  dart_sdk_dir = engine_src.join('third_party', 'dart')
   api.python('kill processes',
                dart_sdk_dir.join('tools', 'task_kill.py'),
                ok_ret=ok_ret)
 
 
-def Build(api, checkout_dir, config, *targets):
-  build_dir = checkout_dir.join('out/%s' % config)
+def Build(api, engine_src, config, *targets):
+  build_dir = engine_src.join('out/%s' % config)
   ninja_cmd = [api.depot_tools.ninja_path, '-j', api.goma.jobs, '-C', build_dir]
   ninja_cmd.extend(targets)
   api.goma.build_with_goma(
@@ -64,75 +64,75 @@
     ninja_command=ninja_cmd)
 
 
-def RunGN(api, checkout_dir, *args):
-  gn_cmd = [checkout_dir.join('flutter/tools/gn')]
+def RunGN(api, engine_src, *args):
+  gn_cmd = [engine_src.join('flutter/tools/gn')]
   gn_cmd.extend(args)
   # Flutter's gn tool needs ninja in the PATH
   with api.depot_tools.on_path():
     api.step('gn %s' % ' '.join(args), gn_cmd)
 
 
-def AnalyzeDartUI(api, checkout_dir):
-  with api.context(cwd=checkout_dir), api.depot_tools.on_path():
+def AnalyzeDartUI(api, engine_src):
+  with api.context(cwd=engine_src), api.depot_tools.on_path():
     api.step('analyze dart_ui', ['/bin/bash', 'flutter/ci/analyze.sh'])
 
 
-def TestEngine(api, checkout_dir):
-  with api.context(cwd=checkout_dir), api.depot_tools.on_path():
+def TestEngine(api, engine_src):
+  with api.context(cwd=engine_src), api.depot_tools.on_path():
     api.step('test engine', ['/bin/bash', 'flutter/testing/run_tests.sh'])
 
 
-def BuildLinuxAndroidx86(api, checkout_dir):
+def BuildLinuxAndroidx86(api, engine_src):
   for x86_variant in ['x64', 'x86']:
-    RunGN(api, checkout_dir, '--android', '--android-cpu=' + x86_variant,
+    RunGN(api, engine_src, '--android', '--android-cpu=' + x86_variant,
           '--no-lto')
-    Build(api, checkout_dir, 'android_debug_' + x86_variant)
+    Build(api, engine_src, 'android_debug_' + x86_variant)
 
 
-def BuildLinuxAndroidArm(api, checkout_dir):
-  RunGN(api, checkout_dir, '--android', '--no-lto')
-  Build(api, checkout_dir, 'android_debug')
-  Build(api, checkout_dir, 'android_debug', ':dist')
+def BuildLinuxAndroidArm(api, engine_src):
+  RunGN(api, engine_src, '--android', '--no-lto')
+  Build(api, engine_src, 'android_debug')
+  Build(api, engine_src, 'android_debug', ':dist')
 
   # Build engines for the runtime modes that use AOT compilation.
   for arch in ['arm', 'arm64', 'x64']:
     for mode in ['profile', 'release']:
       build_dir = 'android_%s%s' % (mode, '' if arch == 'arm' else '_' + arch)
 
-      RunGN(api, checkout_dir, '--android', '--runtime-mode=' + mode,
+      RunGN(api, engine_src, '--android', '--runtime-mode=' + mode,
             '--android-cpu=' + arch)
       # Build the default set of targets.
-      Build(api, checkout_dir, build_dir)
+      Build(api, engine_src, build_dir)
 
 
-def BuildLinux(api, checkout_dir):
-  RunGN(api, checkout_dir, '--full-dart-sdk')
-  Build(api, checkout_dir, 'host_debug')
-  Build(api, checkout_dir, 'host_debug', 'create_full_sdk')
-  RunGN(api, checkout_dir, '--unoptimized')
-  Build(api, checkout_dir, 'host_debug_unopt')
+def BuildLinux(api, engine_src):
+  RunGN(api, engine_src, '--full-dart-sdk')
+  Build(api, engine_src, 'host_debug')
+  Build(api, engine_src, 'host_debug', 'create_full_sdk')
+  RunGN(api, engine_src, '--unoptimized')
+  Build(api, engine_src, 'host_debug_unopt')
   # analyze step needs dart ui sources
-  Build(api, checkout_dir, 'host_debug_unopt', 'generate_dart_ui')
-  RunGN(api, checkout_dir, '--runtime-mode=release')
-  Build(api, checkout_dir, 'host_release')
-  RunGN(api, checkout_dir, '--fuchsia', '--fuchsia-cpu', 'x64',
+  Build(api, engine_src, 'host_debug_unopt', 'generate_dart_ui')
+  RunGN(api, engine_src, '--runtime-mode=release')
+  Build(api, engine_src, 'host_release')
+  RunGN(api, engine_src, '--fuchsia', '--fuchsia-cpu', 'x64',
         '--runtime-mode=debug', '--no-lto')
-  Build(api, checkout_dir, 'fuchsia_debug_x64',
+  Build(api, engine_src, 'fuchsia_debug_x64',
         'flutter/shell/platform/fuchsia:fuchsia', 'fuchsia_tests')
 
 
-def TestObservatory(api, checkout_dir):
-  flutter_tester_path = checkout_dir.join('out/host_debug/flutter_tester')
-  empty_main_path = checkout_dir.join(
+def TestObservatory(api, engine_src):
+  flutter_tester_path = engine_src.join('out/host_debug/flutter_tester')
+  empty_main_path = engine_src.join(
       'flutter/shell/testing/observatory/empty_main.dart')
-  test_path = checkout_dir.join('flutter/shell/testing/observatory/test.dart')
+  test_path = engine_src.join('flutter/shell/testing/observatory/test.dart')
   test_cmd = ['dart', test_path, flutter_tester_path, empty_main_path]
-  with api.context(cwd=checkout_dir):
+  with api.context(cwd=engine_src):
     # Timeout after 5 minutes, this step is prone to hang
     api.step('test observatory and service protocol', test_cmd, timeout=5*60)
 
 
-def GetCheckout(api):
+def GetCheckout(api, start_dir, engine_src):
   src_cfg = api.gclient.make_config()
   src_cfg.target_os = set(['android'])
   commits = {}
@@ -150,9 +150,9 @@
   sdk_rev = commits.get(SDK_REPO, 'HEAD')
 
   src_cfg.revisions = {
-    'src/flutter': engine_rev,
-    'src/third_party/dart': sdk_rev,
-    'flutter': flutter_rev,
+      'src/flutter': engine_rev,
+      'src/third_party/dart': sdk_rev,
+      '../flutter': flutter_rev,
   }
 
   soln = src_cfg.solutions.add()
@@ -160,7 +160,7 @@
   soln.url = ENGINE_REPO_URL
 
   soln = src_cfg.solutions.add()
-  soln.name = 'flutter'
+  soln.name = '../flutter'
   soln.url = FLUTTER_REPO_URL
 
   api.gclient.c = src_cfg
@@ -175,8 +175,13 @@
   api.gclient.runhooks()
 
   with api.depot_tools.on_path(), api.context(env={'DEPOT_TOOLS_UPDATE': 0}):
-    api.step('3xHEAD Flutter Hooks',
-        ['src/third_party/dart/tools/3xhead_flutter_hooks.sh'])
+    # TODO(athom): remove symlink once 3xH tools are updated in the SDK repo.
+    api.file.symlink('symlink flutter to new checkout location',
+                     start_dir.join('flutter'),
+                     start_dir.join('engine', 'flutter'))
+    api.step(
+        '3xHEAD Flutter Hooks',
+        [engine_src.join('third_party/dart/tools/3xhead_flutter_hooks.sh')])
 
   return flutter_rev
 
@@ -269,8 +274,7 @@
     {'file': flutter_tools_snapshot}])
 
 
-def TestFlutter(api, start_dir, just_built_dart_sdk):
-  engine_src = start_dir.join('src')
+def TestFlutter(api, start_dir, engine_src, just_built_dart_sdk):
   flutter = start_dir.join('flutter')
   flutter_cmd = flutter.join('bin/flutter')
   test_args = [
@@ -345,59 +349,58 @@
 
 def RunSteps(api):
   start_dir = api.path['cache'].join('builder')
-  checkout_dir = start_dir.join('src')
+  engine_dir = start_dir.join('engine')
+  engine_src = engine_dir.join('src')
 
   try:
-    with api.context(cwd=start_dir):
-      # buildbot sets 'clobber' to the empty string which is falsey, check with
-      # 'in'
-      if 'clobber' in api.properties:
-        api.file.rmcontents('everything', start_dir)
-      flutter_rev = GetCheckout(api)
+    # buildbot sets 'clobber' to the empty string which is falsey, check with
+    # 'in'
+    if 'clobber' in api.properties:
+      api.file.rmcontents('everything', start_dir)
+    api.file.ensure_directory('mkdir engine', engine_dir)
+    with api.context(cwd=engine_dir):
+      flutter_rev = GetCheckout(api, start_dir, engine_src)
 
     api.goma.ensure_goma()
 
-    KillTasks(api, checkout_dir)
+    KillTasks(api, engine_src)
 
-    BuildAndTest(api, start_dir, checkout_dir, flutter_rev)
+    BuildAndTest(api, start_dir, engine_src, flutter_rev)
   except recipe_api.StepFailure as failure:
     if api.bisect_build.is_enabled and api.buildbucket.gitiles_commit.id:
       api.bisect_build.schedule(LINEARIZED_REPO_URL, failure.reason)
     raise
   finally:
     # TODO(aam): Go back to `ok_ret={0}` once dartbug.com/35549 is fixed
-    KillTasks(api, checkout_dir, ok_ret='any')
+    KillTasks(api, engine_src, ok_ret='any')
   if api.bisect_build.is_bisecting():
     # The build was successful, so search newer builds to find the root cause.
     api.bisect_build.schedule(LINEARIZED_REPO_URL,
                               api.m.bisect_build.REASON_SUCCESS)
 
 
-def BuildAndTest(api, start_dir, checkout_dir, flutter_rev):
+def BuildAndTest(api, start_dir, engine_src, flutter_rev):
   run_env = {
-      'GOMA_DIR':
-          api.goma.goma_dir,
+      'GOMA_DIR': api.goma.goma_dir,
       # By setting 'ANALYZER_STATE_LOCATION_OVERRIDE' we force analyzer to emit
       # its cached state into the given folder. If something goes wrong with
       # the cache we can clobber it by requesting normal clobber via Buildbot
       # UI.
-      'ANALYZER_STATE_LOCATION_OVERRIDE':
-          start_dir.join('.dartServer'),
-      'ANDROID_SDK_ROOT':
-          checkout_dir.join('third_party', 'android_tools', 'sdk')
+      'ANALYZER_STATE_LOCATION_OVERRIDE': start_dir.join('.dartServer'),
+      'ANDROID_SDK_ROOT': engine_src.join('third_party', 'android_tools', 'sdk')
   }
   with api.context(cwd=start_dir, env=run_env):
     api.step('accept android licenses', [
         'bash', '-c', 'yes | $ANDROID_SDK_ROOT/tools/bin/sdkmanager --licenses'
     ])
 
-    BuildLinux(api, checkout_dir)
-    prebuilt_dart_bin = checkout_dir.join('third_party', 'dart', 'tools',
-      'sdks', 'dart-sdk', 'bin')
+    BuildLinux(api, engine_src)
+    prebuilt_dart_bin = engine_src.join('third_party', 'dart', 'tools', 'sdks',
+                                        'dart-sdk', 'bin')
     engine_env = {
         'PATH': api.path.pathsep.join((str(prebuilt_dart_bin), '%(PATH)s')),
     }
-    just_built_dart_sdk = checkout_dir.join('out', 'host_debug', 'dart-sdk')
+    just_built_dart_sdk = engine_src.join('out', 'host_debug', 'dart-sdk')
 
     # The web test shards need google-chrome installed.
     # The chrome version is the version of a package at:
@@ -424,14 +427,14 @@
     with api.step.defer_results():
       # The context adds prebuilt dart-sdk to the path.
       with api.context(env=engine_env):
-        AnalyzeDartUI(api, checkout_dir)
-        TestEngine(api, checkout_dir)
-        TestObservatory(api, checkout_dir)
-        BuildLinuxAndroidArm(api, checkout_dir)
-        BuildLinuxAndroidx86(api, checkout_dir)
+        AnalyzeDartUI(api, engine_src)
+        TestEngine(api, engine_src)
+        TestObservatory(api, engine_src)
+        BuildLinuxAndroidArm(api, engine_src)
+        BuildLinuxAndroidx86(api, engine_src)
       # The context adds freshly-built engine's dart-sdk to the path.
       with api.context(env=flutter_env):
-        TestFlutter(api, start_dir, just_built_dart_sdk)
+        TestFlutter(api, start_dir, engine_src, just_built_dart_sdk)
 
 
 def _test(api, name, failure=False):