No longer build "generate_dart_ui" build target in flutter recipe

The flutter-hhh build is failing due to removal of this target.
The target was removed here:

    https://github.com/flutter/engine/pull/27445

Change-Id: Id06abdda12641878d7707f8a229d38efb35419dd
Reviewed-on: https://dart-review.googlesource.com/c/recipes/+/207181
Reviewed-by: William Hesse <whesse@google.com>
Commit-Queue: Martin Kustermann <kustermann@google.com>
diff --git a/README.recipes.md b/README.recipes.md
index 90d9b21..eddbbce 100644
--- a/README.recipes.md
+++ b/README.recipes.md
@@ -189,7 +189,7 @@
 
 &mdash; **def [Build](/recipes/dart/flutter_engine.py#62)(api, engine_src, config, \*targets):**
 
-&mdash; **def [BuildAndTest](/recipes/dart/flutter_engine.py#401)(api, start_dir, engine_src, flutter_rev):**
+&mdash; **def [BuildAndTest](/recipes/dart/flutter_engine.py#400)(api, start_dir, engine_src, flutter_rev):**
 
 &mdash; **def [BuildLinux](/recipes/dart/flutter_engine.py#112)(api, engine_src):**
 
@@ -197,9 +197,9 @@
 
 &mdash; **def [BuildLinuxAndroidx86](/recipes/dart/flutter_engine.py#89)(api, engine_src):**
 
-&mdash; **def [CopyArtifacts](/recipes/dart/flutter_engine.py#193)(api, engine_src, cached_dest, file_paths):**
+&mdash; **def [CopyArtifacts](/recipes/dart/flutter_engine.py#192)(api, engine_src, cached_dest, file_paths):**
 
-&mdash; **def [GetCheckout](/recipes/dart/flutter_engine.py#139)(api, start_dir, engine_src):**
+&mdash; **def [GetCheckout](/recipes/dart/flutter_engine.py#138)(api, start_dir, engine_src):**
 
 &mdash; **def [KillTasks](/recipes/dart/flutter_engine.py#48)(api, engine_src, ok_ret='any'):**
 
@@ -207,15 +207,15 @@
 
 &mdash; **def [RunGN](/recipes/dart/flutter_engine.py#71)(api, engine_src, \*args):**
 
-&mdash; **def [RunSteps](/recipes/dart/flutter_engine.py#371)(api):**
+&mdash; **def [RunSteps](/recipes/dart/flutter_engine.py#370)(api):**
 
 &mdash; **def [TestEngine](/recipes/dart/flutter_engine.py#84)(api, engine_src):**
 
-&mdash; **def [TestFlutter](/recipes/dart/flutter_engine.py#291)(api, start_dir, engine_src, just_built_dart_sdk):**
+&mdash; **def [TestFlutter](/recipes/dart/flutter_engine.py#290)(api, start_dir, engine_src, just_built_dart_sdk):**
 
-&mdash; **def [TestObservatory](/recipes/dart/flutter_engine.py#128)(api, engine_src):**
+&mdash; **def [TestObservatory](/recipes/dart/flutter_engine.py#127)(api, engine_src):**
 
-&mdash; **def [UpdateCachedEngineArtifacts](/recipes/dart/flutter_engine.py#206)(api, flutter, engine_src):**
+&mdash; **def [UpdateCachedEngineArtifacts](/recipes/dart/flutter_engine.py#205)(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 d89c3bc..f408834 100644
--- a/recipes/dart/flutter_engine.expected/flutter-engine-linux.json
+++ b/recipes/dart/flutter_engine.expected/flutter-engine-linux.json
@@ -1177,6 +1177,27 @@
     ]
   },
   {
+    "cmd": [
+      "[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/engine/src/third_party/android_tools/sdk",
+      "GOMA_DIR": "[CACHE]/goma/client"
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "name": "gn --runtime-mode=release"
+  },
+  {
     "cmd": [],
     "name": "preprocess_for_goma (4)"
   },
@@ -1274,8 +1295,7 @@
       "-j",
       "80",
       "-C",
-      "[CACHE]/builder/engine/src/out/host_debug_unopt",
-      "generate_dart_ui"
+      "[CACHE]/builder/engine/src/out/host_release"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1283,7 +1303,7 @@
       "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"
+    "name": "build host_release"
   },
   {
     "cmd": [],
@@ -1399,7 +1419,7 @@
       "--build-exit-status",
       "0",
       "--build-step-name",
-      "build host_debug_unopt generate_dart_ui",
+      "build host_release",
       "--goma-stats-file",
       "[TMP_BASE]/goma_stats",
       "--goma-counterz-file",
@@ -1462,7 +1482,11 @@
   {
     "cmd": [
       "[CACHE]/builder/engine/src/flutter/tools/gn",
-      "--runtime-mode=release"
+      "--fuchsia",
+      "--fuchsia-cpu",
+      "x64",
+      "--runtime-mode=debug",
+      "--no-lto"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1478,7 +1502,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "gn --runtime-mode=release"
+    "name": "gn --fuchsia --fuchsia-cpu x64 --runtime-mode=debug --no-lto"
   },
   {
     "cmd": [],
@@ -1578,7 +1602,9 @@
       "-j",
       "80",
       "-C",
-      "[CACHE]/builder/engine/src/out/host_release"
+      "[CACHE]/builder/engine/src/out/fuchsia_debug_x64",
+      "flutter/shell/platform/fuchsia:fuchsia",
+      "fuchsia_tests"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1586,7 +1612,7 @@
       "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
-    "name": "build host_release"
+    "name": "build fuchsia_debug_x64 flutter/shell/platform/fuchsia:fuchsia fuchsia_tests"
   },
   {
     "cmd": [],
@@ -1702,7 +1728,7 @@
       "--build-exit-status",
       "0",
       "--build-step-name",
-      "build host_release",
+      "build fuchsia_debug_x64 flutter/shell/platform/fuchsia:fuchsia fuchsia_tests",
       "--goma-stats-file",
       "[TMP_BASE]/goma_stats",
       "--goma-counterz-file",
@@ -1764,315 +1790,6 @@
   },
   {
     "cmd": [
-      "[CACHE]/builder/engine/src/flutter/tools/gn",
-      "--fuchsia",
-      "--fuchsia-cpu",
-      "x64",
-      "--runtime-mode=debug",
-      "--no-lto"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
-      "GOMA_DIR": "[CACHE]/goma/client"
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "name": "gn --fuchsia --fuchsia-cpu x64 --runtime-mode=debug --no-lto"
-  },
-  {
-    "cmd": [],
-    "name": "preprocess_for_goma (6)"
-  },
-  {
-    "cmd": [
-      "vpython",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0777",
-      "[CACHE]/goma/data/flutter_engine_linux"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
-      "GOMA_DIR": "[CACHE]/goma/client"
-    },
-    "infra_step": true,
-    "name": "preprocess_for_goma (6).goma cache directory",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "[CACHE]/goma/client/goma_ctl.py",
-      "restart"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "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",
-      "GOMA_DUMP_COUNTERZ_FILE": "[TMP_BASE]/goma_counterz",
-      "GOMA_DUMP_STATS_FILE": "[TMP_BASE]/goma_stats",
-      "GOMA_ENABLE_COUNTERZ": "true",
-      "GOMA_HERMETIC": "error",
-      "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
-    },
-    "infra_step": true,
-    "name": "preprocess_for_goma (6).start_goma",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LINK@cloudtail@https://console.cloud.google.com/logs/viewer?project=goma-logs&resource=gce_instance%2Finstance_id%2Ffakevm999-m9@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "preprocess_for_goma (6).goma_with_global_service_account",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "RECIPE_REPO[build]/scripts/tools/runit.py",
-      "--show-path",
-      "--with-third-party-lib",
-      "--",
-      "python",
-      "RECIPE_MODULE[build::goma]/resources/cloudtail_utils.py",
-      "start",
-      "--cloudtail-path",
-      "cloudtail",
-      "--pid-file",
-      "[TMP_BASE]/cloudtail.pid",
-      "--cloudtail-service-account-json",
-      "/creds/service_accounts/service-account-goma-cloudtail.json"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
-      "GOMA_DIR": "[CACHE]/goma/client"
-    },
-    "infra_step": true,
-    "name": "preprocess_for_goma (6).start cloudtail",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
-      "-j",
-      "80",
-      "-C",
-      "[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/engine/src/third_party/android_tools/sdk",
-      "GOMA_DIR": "[CACHE]/goma/client"
-    },
-    "name": "build fuchsia_debug_x64 flutter/shell/platform/fuchsia:fuchsia fuchsia_tests"
-  },
-  {
-    "cmd": [],
-    "name": "postprocess_for_goma (6)"
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "[CACHE]/goma/client/goma_ctl.py",
-      "jsonstatus",
-      "[TMP_BASE]/goma_jsonstatus.json"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "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",
-      "GOMA_DUMP_COUNTERZ_FILE": "[TMP_BASE]/goma_counterz",
-      "GOMA_DUMP_STATS_FILE": "[TMP_BASE]/goma_stats",
-      "GOMA_ENABLE_COUNTERZ": "true",
-      "GOMA_HERMETIC": "error",
-      "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
-    },
-    "name": "postprocess_for_goma (6).goma_jsonstatus",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"notice\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@    {@@@",
-      "@@@STEP_LOG_LINE@json.output@      \"infra_status\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"num_user_error\": 0, @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"ping_status_code\": 200@@@",
-      "@@@STEP_LOG_LINE@json.output@      }@@@",
-      "@@@STEP_LOG_LINE@json.output@    }@@@",
-      "@@@STEP_LOG_LINE@json.output@  ]@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "[CACHE]/goma/client/goma_ctl.py",
-      "stat"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "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",
-      "GOMA_DUMP_COUNTERZ_FILE": "[TMP_BASE]/goma_counterz",
-      "GOMA_DUMP_STATS_FILE": "[TMP_BASE]/goma_stats",
-      "GOMA_ENABLE_COUNTERZ": "true",
-      "GOMA_HERMETIC": "error",
-      "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
-    },
-    "name": "postprocess_for_goma (6).goma_stat",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "[CACHE]/goma/client/goma_ctl.py",
-      "stop"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "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",
-      "GOMA_DUMP_COUNTERZ_FILE": "[TMP_BASE]/goma_counterz",
-      "GOMA_DUMP_STATS_FILE": "[TMP_BASE]/goma_stats",
-      "GOMA_ENABLE_COUNTERZ": "true",
-      "GOMA_HERMETIC": "error",
-      "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
-    },
-    "name": "postprocess_for_goma (6).stop_goma",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython",
-      "-u",
-      "RECIPE_REPO[build]/scripts/tools/runit.py",
-      "--show-path",
-      "--",
-      "python",
-      "RECIPE_REPO[build]/recipes/upload_goma_logs.py",
-      "--upload-compiler-proxy-info",
-      "--log-url-json-file",
-      "/path/to/tmp/json",
-      "--gsutil-py-path",
-      "RECIPE_REPO[depot_tools]/gsutil.py",
-      "--bqupload-path",
-      "[CACHE]/goma/bqupload/bqupload",
-      "--bigquery-service-account-json",
-      "/creds/service_accounts/service-account-goma-bigquery.json",
-      "--json-status",
-      "[TMP_BASE]/goma_jsonstatus.json",
-      "--build-exit-status",
-      "0",
-      "--build-step-name",
-      "build fuchsia_debug_x64 flutter/shell/platform/fuchsia:fuchsia fuchsia_tests",
-      "--goma-stats-file",
-      "[TMP_BASE]/goma_stats",
-      "--goma-counterz-file",
-      "[TMP_BASE]/goma_counterz",
-      "--goma-crash-report-id-file",
-      "[TMP_BASE]/crash_report_id",
-      "--build-id",
-      "8945511751514863184",
-      "--builder-id-json",
-      "{\"bucket\": \"ci\", \"builder\": \"flutter-engine-linux\", \"project\": \"project\"}",
-      "--is-luci",
-      "--buildbot-buildername",
-      "flutter-engine-linux",
-      "--buildbot-slavename",
-      "fake-bot-id"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
-      "GOMA_DIR": "[CACHE]/goma/client"
-    },
-    "name": "postprocess_for_goma (6).upload_log",
-    "timeout": 300,
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"compiler_proxy_log\": \"https://chromium-build-stats.appspot.com/compiler_proxy_log/2017/03/30/build11-m1/compiler_proxy.exe.BUILD11-M1.chrome-bot.log.INFO.20170329-222936.4420.gz\"@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@",
-      "@@@STEP_LINK@compiler_proxy_log@https://chromium-build-stats.appspot.com/compiler_proxy_log/2017/03/30/build11-m1/compiler_proxy.exe.BUILD11-M1.chrome-bot.log.INFO.20170329-222936.4420.gz@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "RECIPE_REPO[build]/scripts/tools/runit.py",
-      "--show-path",
-      "--with-third-party-lib",
-      "--",
-      "python",
-      "RECIPE_MODULE[build::goma]/resources/cloudtail_utils.py",
-      "stop",
-      "--killed-pid-file",
-      "[TMP_BASE]/cloudtail.pid"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
-      "GOMA_DIR": "[CACHE]/goma/client"
-    },
-    "infra_step": true,
-    "name": "postprocess_for_goma (6).stop cloudtail",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
       "vpython",
       "-u",
       "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
@@ -2212,6 +1929,297 @@
   },
   {
     "cmd": [],
+    "name": "preprocess_for_goma (6)"
+  },
+  {
+    "cmd": [
+      "vpython",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "ensure-directory",
+      "--mode",
+      "0777",
+      "[CACHE]/goma/data/flutter_engine_linux"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "GOMA_DIR": "[CACHE]/goma/client",
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+    },
+    "infra_step": true,
+    "name": "preprocess_for_goma (6).goma cache directory",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "[CACHE]/goma/client/goma_ctl.py",
+      "restart"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
+      "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",
+      "GOMA_DUMP_COUNTERZ_FILE": "[TMP_BASE]/goma_counterz",
+      "GOMA_DUMP_STATS_FILE": "[TMP_BASE]/goma_stats",
+      "GOMA_ENABLE_COUNTERZ": "true",
+      "GOMA_HERMETIC": "error",
+      "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+    },
+    "infra_step": true,
+    "name": "preprocess_for_goma (6).start_goma",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LINK@cloudtail@https://console.cloud.google.com/logs/viewer?project=goma-logs&resource=gce_instance%2Finstance_id%2Ffakevm999-m9@@@"
+    ]
+  },
+  {
+    "cmd": [],
+    "name": "preprocess_for_goma (6).goma_with_global_service_account",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "RECIPE_REPO[build]/scripts/tools/runit.py",
+      "--show-path",
+      "--with-third-party-lib",
+      "--",
+      "python",
+      "RECIPE_MODULE[build::goma]/resources/cloudtail_utils.py",
+      "start",
+      "--cloudtail-path",
+      "cloudtail",
+      "--pid-file",
+      "[TMP_BASE]/cloudtail.pid",
+      "--cloudtail-service-account-json",
+      "/creds/service_accounts/service-account-goma-cloudtail.json"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "GOMA_DIR": "[CACHE]/goma/client",
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+    },
+    "infra_step": true,
+    "name": "preprocess_for_goma (6).start cloudtail",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "RECIPE_REPO[depot_tools]/ninja",
+      "-j",
+      "80",
+      "-C",
+      "[CACHE]/builder/engine/src/out/android_debug"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "GOMA_DIR": "[CACHE]/goma/client",
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+    },
+    "name": "build android_debug"
+  },
+  {
+    "cmd": [],
+    "name": "postprocess_for_goma (6)"
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "[CACHE]/goma/client/goma_ctl.py",
+      "jsonstatus",
+      "[TMP_BASE]/goma_jsonstatus.json"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
+      "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",
+      "GOMA_DUMP_COUNTERZ_FILE": "[TMP_BASE]/goma_counterz",
+      "GOMA_DUMP_STATS_FILE": "[TMP_BASE]/goma_stats",
+      "GOMA_ENABLE_COUNTERZ": "true",
+      "GOMA_HERMETIC": "error",
+      "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+    },
+    "name": "postprocess_for_goma (6).goma_jsonstatus",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"notice\": [@@@",
+      "@@@STEP_LOG_LINE@json.output@    {@@@",
+      "@@@STEP_LOG_LINE@json.output@      \"infra_status\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"num_user_error\": 0, @@@",
+      "@@@STEP_LOG_LINE@json.output@        \"ping_status_code\": 200@@@",
+      "@@@STEP_LOG_LINE@json.output@      }@@@",
+      "@@@STEP_LOG_LINE@json.output@    }@@@",
+      "@@@STEP_LOG_LINE@json.output@  ]@@@",
+      "@@@STEP_LOG_LINE@json.output@}@@@",
+      "@@@STEP_LOG_END@json.output@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "[CACHE]/goma/client/goma_ctl.py",
+      "stat"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
+      "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",
+      "GOMA_DUMP_COUNTERZ_FILE": "[TMP_BASE]/goma_counterz",
+      "GOMA_DUMP_STATS_FILE": "[TMP_BASE]/goma_stats",
+      "GOMA_ENABLE_COUNTERZ": "true",
+      "GOMA_HERMETIC": "error",
+      "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+    },
+    "name": "postprocess_for_goma (6).goma_stat",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "[CACHE]/goma/client/goma_ctl.py",
+      "stop"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
+      "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",
+      "GOMA_DUMP_COUNTERZ_FILE": "[TMP_BASE]/goma_counterz",
+      "GOMA_DUMP_STATS_FILE": "[TMP_BASE]/goma_stats",
+      "GOMA_ENABLE_COUNTERZ": "true",
+      "GOMA_HERMETIC": "error",
+      "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+    },
+    "name": "postprocess_for_goma (6).stop_goma",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "vpython",
+      "-u",
+      "RECIPE_REPO[build]/scripts/tools/runit.py",
+      "--show-path",
+      "--",
+      "python",
+      "RECIPE_REPO[build]/recipes/upload_goma_logs.py",
+      "--upload-compiler-proxy-info",
+      "--log-url-json-file",
+      "/path/to/tmp/json",
+      "--gsutil-py-path",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "--bqupload-path",
+      "[CACHE]/goma/bqupload/bqupload",
+      "--bigquery-service-account-json",
+      "/creds/service_accounts/service-account-goma-bigquery.json",
+      "--json-status",
+      "[TMP_BASE]/goma_jsonstatus.json",
+      "--build-exit-status",
+      "0",
+      "--build-step-name",
+      "build android_debug",
+      "--goma-stats-file",
+      "[TMP_BASE]/goma_stats",
+      "--goma-counterz-file",
+      "[TMP_BASE]/goma_counterz",
+      "--goma-crash-report-id-file",
+      "[TMP_BASE]/crash_report_id",
+      "--build-id",
+      "8945511751514863184",
+      "--builder-id-json",
+      "{\"bucket\": \"ci\", \"builder\": \"flutter-engine-linux\", \"project\": \"project\"}",
+      "--is-luci",
+      "--buildbot-buildername",
+      "flutter-engine-linux",
+      "--buildbot-slavename",
+      "fake-bot-id"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "GOMA_DIR": "[CACHE]/goma/client",
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+    },
+    "name": "postprocess_for_goma (6).upload_log",
+    "timeout": 300,
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"compiler_proxy_log\": \"https://chromium-build-stats.appspot.com/compiler_proxy_log/2017/03/30/build11-m1/compiler_proxy.exe.BUILD11-M1.chrome-bot.log.INFO.20170329-222936.4420.gz\"@@@",
+      "@@@STEP_LOG_LINE@json.output@}@@@",
+      "@@@STEP_LOG_END@json.output@@@",
+      "@@@STEP_LINK@compiler_proxy_log@https://chromium-build-stats.appspot.com/compiler_proxy_log/2017/03/30/build11-m1/compiler_proxy.exe.BUILD11-M1.chrome-bot.log.INFO.20170329-222936.4420.gz@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "RECIPE_REPO[build]/scripts/tools/runit.py",
+      "--show-path",
+      "--with-third-party-lib",
+      "--",
+      "python",
+      "RECIPE_MODULE[build::goma]/resources/cloudtail_utils.py",
+      "stop",
+      "--killed-pid-file",
+      "[TMP_BASE]/cloudtail.pid"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "GOMA_DIR": "[CACHE]/goma/client",
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+    },
+    "infra_step": true,
+    "name": "postprocess_for_goma (6).stop cloudtail",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [],
     "name": "preprocess_for_goma (7)"
   },
   {
@@ -2311,7 +2319,8 @@
       "-j",
       "80",
       "-C",
-      "[CACHE]/builder/engine/src/out/android_debug"
+      "[CACHE]/builder/engine/src/out/android_debug",
+      ":dist"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -2320,7 +2329,7 @@
       "GOMA_DIR": "[CACHE]/goma/client",
       "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
-    "name": "build android_debug"
+    "name": "build android_debug :dist"
   },
   {
     "cmd": [],
@@ -2439,7 +2448,7 @@
       "--build-exit-status",
       "0",
       "--build-step-name",
-      "build android_debug",
+      "build android_debug :dist",
       "--goma-stats-file",
       "[TMP_BASE]/goma_stats",
       "--goma-counterz-file",
@@ -2502,6 +2511,30 @@
     ]
   },
   {
+    "cmd": [
+      "[CACHE]/builder/engine/src/flutter/tools/gn",
+      "--android",
+      "--runtime-mode=profile",
+      "--android-cpu=arm"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "GOMA_DIR": "[CACHE]/goma/client",
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "name": "gn --android --runtime-mode=profile --android-cpu=arm"
+  },
+  {
     "cmd": [],
     "name": "preprocess_for_goma (8)"
   },
@@ -2602,8 +2635,7 @@
       "-j",
       "80",
       "-C",
-      "[CACHE]/builder/engine/src/out/android_debug",
-      ":dist"
+      "[CACHE]/builder/engine/src/out/android_profile"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -2612,7 +2644,7 @@
       "GOMA_DIR": "[CACHE]/goma/client",
       "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
-    "name": "build android_debug :dist"
+    "name": "build android_profile"
   },
   {
     "cmd": [],
@@ -2731,7 +2763,7 @@
       "--build-exit-status",
       "0",
       "--build-step-name",
-      "build android_debug :dist",
+      "build android_profile",
       "--goma-stats-file",
       "[TMP_BASE]/goma_stats",
       "--goma-counterz-file",
@@ -2797,7 +2829,7 @@
     "cmd": [
       "[CACHE]/builder/engine/src/flutter/tools/gn",
       "--android",
-      "--runtime-mode=profile",
+      "--runtime-mode=release",
       "--android-cpu=arm"
     ],
     "cwd": "[CACHE]/builder",
@@ -2815,7 +2847,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "gn --android --runtime-mode=profile --android-cpu=arm"
+    "name": "gn --android --runtime-mode=release --android-cpu=arm"
   },
   {
     "cmd": [],
@@ -2918,7 +2950,7 @@
       "-j",
       "80",
       "-C",
-      "[CACHE]/builder/engine/src/out/android_profile"
+      "[CACHE]/builder/engine/src/out/android_release"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -2927,7 +2959,7 @@
       "GOMA_DIR": "[CACHE]/goma/client",
       "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
-    "name": "build android_profile"
+    "name": "build android_release"
   },
   {
     "cmd": [],
@@ -3046,7 +3078,7 @@
       "--build-exit-status",
       "0",
       "--build-step-name",
-      "build android_profile",
+      "build android_release",
       "--goma-stats-file",
       "[TMP_BASE]/goma_stats",
       "--goma-counterz-file",
@@ -3112,8 +3144,8 @@
     "cmd": [
       "[CACHE]/builder/engine/src/flutter/tools/gn",
       "--android",
-      "--runtime-mode=release",
-      "--android-cpu=arm"
+      "--runtime-mode=profile",
+      "--android-cpu=arm64"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -3130,7 +3162,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "gn --android --runtime-mode=release --android-cpu=arm"
+    "name": "gn --android --runtime-mode=profile --android-cpu=arm64"
   },
   {
     "cmd": [],
@@ -3233,7 +3265,7 @@
       "-j",
       "80",
       "-C",
-      "[CACHE]/builder/engine/src/out/android_release"
+      "[CACHE]/builder/engine/src/out/android_profile_arm64"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -3242,7 +3274,7 @@
       "GOMA_DIR": "[CACHE]/goma/client",
       "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
-    "name": "build android_release"
+    "name": "build android_profile_arm64"
   },
   {
     "cmd": [],
@@ -3361,7 +3393,7 @@
       "--build-exit-status",
       "0",
       "--build-step-name",
-      "build android_release",
+      "build android_profile_arm64",
       "--goma-stats-file",
       "[TMP_BASE]/goma_stats",
       "--goma-counterz-file",
@@ -3427,7 +3459,7 @@
     "cmd": [
       "[CACHE]/builder/engine/src/flutter/tools/gn",
       "--android",
-      "--runtime-mode=profile",
+      "--runtime-mode=release",
       "--android-cpu=arm64"
     ],
     "cwd": "[CACHE]/builder",
@@ -3445,7 +3477,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "gn --android --runtime-mode=profile --android-cpu=arm64"
+    "name": "gn --android --runtime-mode=release --android-cpu=arm64"
   },
   {
     "cmd": [],
@@ -3548,7 +3580,7 @@
       "-j",
       "80",
       "-C",
-      "[CACHE]/builder/engine/src/out/android_profile_arm64"
+      "[CACHE]/builder/engine/src/out/android_release_arm64"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -3557,7 +3589,7 @@
       "GOMA_DIR": "[CACHE]/goma/client",
       "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
-    "name": "build android_profile_arm64"
+    "name": "build android_release_arm64"
   },
   {
     "cmd": [],
@@ -3676,7 +3708,7 @@
       "--build-exit-status",
       "0",
       "--build-step-name",
-      "build android_profile_arm64",
+      "build android_release_arm64",
       "--goma-stats-file",
       "[TMP_BASE]/goma_stats",
       "--goma-counterz-file",
@@ -3742,8 +3774,8 @@
     "cmd": [
       "[CACHE]/builder/engine/src/flutter/tools/gn",
       "--android",
-      "--runtime-mode=release",
-      "--android-cpu=arm64"
+      "--runtime-mode=profile",
+      "--android-cpu=x64"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -3760,7 +3792,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "gn --android --runtime-mode=release --android-cpu=arm64"
+    "name": "gn --android --runtime-mode=profile --android-cpu=x64"
   },
   {
     "cmd": [],
@@ -3863,7 +3895,7 @@
       "-j",
       "80",
       "-C",
-      "[CACHE]/builder/engine/src/out/android_release_arm64"
+      "[CACHE]/builder/engine/src/out/android_profile_x64"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -3872,7 +3904,7 @@
       "GOMA_DIR": "[CACHE]/goma/client",
       "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
-    "name": "build android_release_arm64"
+    "name": "build android_profile_x64"
   },
   {
     "cmd": [],
@@ -3991,7 +4023,7 @@
       "--build-exit-status",
       "0",
       "--build-step-name",
-      "build android_release_arm64",
+      "build android_profile_x64",
       "--goma-stats-file",
       "[TMP_BASE]/goma_stats",
       "--goma-counterz-file",
@@ -4057,7 +4089,7 @@
     "cmd": [
       "[CACHE]/builder/engine/src/flutter/tools/gn",
       "--android",
-      "--runtime-mode=profile",
+      "--runtime-mode=release",
       "--android-cpu=x64"
     ],
     "cwd": "[CACHE]/builder",
@@ -4075,7 +4107,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "gn --android --runtime-mode=profile --android-cpu=x64"
+    "name": "gn --android --runtime-mode=release --android-cpu=x64"
   },
   {
     "cmd": [],
@@ -4178,7 +4210,7 @@
       "-j",
       "80",
       "-C",
-      "[CACHE]/builder/engine/src/out/android_profile_x64"
+      "[CACHE]/builder/engine/src/out/android_release_x64"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -4187,7 +4219,7 @@
       "GOMA_DIR": "[CACHE]/goma/client",
       "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
-    "name": "build android_profile_x64"
+    "name": "build android_release_x64"
   },
   {
     "cmd": [],
@@ -4306,7 +4338,7 @@
       "--build-exit-status",
       "0",
       "--build-step-name",
-      "build android_profile_x64",
+      "build android_release_x64",
       "--goma-stats-file",
       "[TMP_BASE]/goma_stats",
       "--goma-counterz-file",
@@ -4372,8 +4404,8 @@
     "cmd": [
       "[CACHE]/builder/engine/src/flutter/tools/gn",
       "--android",
-      "--runtime-mode=release",
-      "--android-cpu=x64"
+      "--android-cpu=x64",
+      "--no-lto"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -4390,7 +4422,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "gn --android --runtime-mode=release --android-cpu=x64"
+    "name": "gn --android --android-cpu=x64 --no-lto"
   },
   {
     "cmd": [],
@@ -4493,7 +4525,7 @@
       "-j",
       "80",
       "-C",
-      "[CACHE]/builder/engine/src/out/android_release_x64"
+      "[CACHE]/builder/engine/src/out/android_debug_x64"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -4502,7 +4534,7 @@
       "GOMA_DIR": "[CACHE]/goma/client",
       "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
-    "name": "build android_release_x64"
+    "name": "build android_debug_x64"
   },
   {
     "cmd": [],
@@ -4621,7 +4653,7 @@
       "--build-exit-status",
       "0",
       "--build-step-name",
-      "build android_release_x64",
+      "build android_debug_x64",
       "--goma-stats-file",
       "[TMP_BASE]/goma_stats",
       "--goma-counterz-file",
@@ -4687,7 +4719,7 @@
     "cmd": [
       "[CACHE]/builder/engine/src/flutter/tools/gn",
       "--android",
-      "--android-cpu=x64",
+      "--android-cpu=x86",
       "--no-lto"
     ],
     "cwd": "[CACHE]/builder",
@@ -4705,7 +4737,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "gn --android --android-cpu=x64 --no-lto"
+    "name": "gn --android --android-cpu=x86 --no-lto"
   },
   {
     "cmd": [],
@@ -4808,7 +4840,7 @@
       "-j",
       "80",
       "-C",
-      "[CACHE]/builder/engine/src/out/android_debug_x64"
+      "[CACHE]/builder/engine/src/out/android_debug_x86"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -4817,7 +4849,7 @@
       "GOMA_DIR": "[CACHE]/goma/client",
       "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
-    "name": "build android_debug_x64"
+    "name": "build android_debug_x86"
   },
   {
     "cmd": [],
@@ -4936,7 +4968,7 @@
       "--build-exit-status",
       "0",
       "--build-step-name",
-      "build android_debug_x64",
+      "build android_debug_x86",
       "--goma-stats-file",
       "[TMP_BASE]/goma_stats",
       "--goma-counterz-file",
@@ -5000,321 +5032,6 @@
   },
   {
     "cmd": [
-      "[CACHE]/builder/engine/src/flutter/tools/gn",
-      "--android",
-      "--android-cpu=x86",
-      "--no-lto"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
-      "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "name": "gn --android --android-cpu=x86 --no-lto"
-  },
-  {
-    "cmd": [],
-    "name": "preprocess_for_goma (16)"
-  },
-  {
-    "cmd": [
-      "vpython",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0777",
-      "[CACHE]/goma/data/flutter_engine_linux"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
-      "GOMA_DIR": "[CACHE]/goma/client",
-      "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",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "[CACHE]/goma/client/goma_ctl.py",
-      "restart"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "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",
-      "GOMA_DUMP_COUNTERZ_FILE": "[TMP_BASE]/goma_counterz",
-      "GOMA_DUMP_STATS_FILE": "[TMP_BASE]/goma_stats",
-      "GOMA_ENABLE_COUNTERZ": "true",
-      "GOMA_HERMETIC": "error",
-      "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
-    },
-    "infra_step": true,
-    "name": "preprocess_for_goma (16).start_goma",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LINK@cloudtail@https://console.cloud.google.com/logs/viewer?project=goma-logs&resource=gce_instance%2Finstance_id%2Ffakevm999-m9@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "preprocess_for_goma (16).goma_with_global_service_account",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "RECIPE_REPO[build]/scripts/tools/runit.py",
-      "--show-path",
-      "--with-third-party-lib",
-      "--",
-      "python",
-      "RECIPE_MODULE[build::goma]/resources/cloudtail_utils.py",
-      "start",
-      "--cloudtail-path",
-      "cloudtail",
-      "--pid-file",
-      "[TMP_BASE]/cloudtail.pid",
-      "--cloudtail-service-account-json",
-      "/creds/service_accounts/service-account-goma-cloudtail.json"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
-      "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
-    },
-    "infra_step": true,
-    "name": "preprocess_for_goma (16).start cloudtail",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
-      "-j",
-      "80",
-      "-C",
-      "[CACHE]/builder/engine/src/out/android_debug_x86"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
-      "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
-    },
-    "name": "build android_debug_x86"
-  },
-  {
-    "cmd": [],
-    "name": "postprocess_for_goma (16)"
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "[CACHE]/goma/client/goma_ctl.py",
-      "jsonstatus",
-      "[TMP_BASE]/goma_jsonstatus.json"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "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",
-      "GOMA_DUMP_COUNTERZ_FILE": "[TMP_BASE]/goma_counterz",
-      "GOMA_DUMP_STATS_FILE": "[TMP_BASE]/goma_stats",
-      "GOMA_ENABLE_COUNTERZ": "true",
-      "GOMA_HERMETIC": "error",
-      "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
-    },
-    "name": "postprocess_for_goma (16).goma_jsonstatus",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"notice\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@    {@@@",
-      "@@@STEP_LOG_LINE@json.output@      \"infra_status\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"num_user_error\": 0, @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"ping_status_code\": 200@@@",
-      "@@@STEP_LOG_LINE@json.output@      }@@@",
-      "@@@STEP_LOG_LINE@json.output@    }@@@",
-      "@@@STEP_LOG_LINE@json.output@  ]@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "[CACHE]/goma/client/goma_ctl.py",
-      "stat"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "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",
-      "GOMA_DUMP_COUNTERZ_FILE": "[TMP_BASE]/goma_counterz",
-      "GOMA_DUMP_STATS_FILE": "[TMP_BASE]/goma_stats",
-      "GOMA_ENABLE_COUNTERZ": "true",
-      "GOMA_HERMETIC": "error",
-      "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
-    },
-    "name": "postprocess_for_goma (16).goma_stat",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "[CACHE]/goma/client/goma_ctl.py",
-      "stop"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "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",
-      "GOMA_DUMP_COUNTERZ_FILE": "[TMP_BASE]/goma_counterz",
-      "GOMA_DUMP_STATS_FILE": "[TMP_BASE]/goma_stats",
-      "GOMA_ENABLE_COUNTERZ": "true",
-      "GOMA_HERMETIC": "error",
-      "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
-    },
-    "name": "postprocess_for_goma (16).stop_goma",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython",
-      "-u",
-      "RECIPE_REPO[build]/scripts/tools/runit.py",
-      "--show-path",
-      "--",
-      "python",
-      "RECIPE_REPO[build]/recipes/upload_goma_logs.py",
-      "--upload-compiler-proxy-info",
-      "--log-url-json-file",
-      "/path/to/tmp/json",
-      "--gsutil-py-path",
-      "RECIPE_REPO[depot_tools]/gsutil.py",
-      "--bqupload-path",
-      "[CACHE]/goma/bqupload/bqupload",
-      "--bigquery-service-account-json",
-      "/creds/service_accounts/service-account-goma-bigquery.json",
-      "--json-status",
-      "[TMP_BASE]/goma_jsonstatus.json",
-      "--build-exit-status",
-      "0",
-      "--build-step-name",
-      "build android_debug_x86",
-      "--goma-stats-file",
-      "[TMP_BASE]/goma_stats",
-      "--goma-counterz-file",
-      "[TMP_BASE]/goma_counterz",
-      "--goma-crash-report-id-file",
-      "[TMP_BASE]/crash_report_id",
-      "--build-id",
-      "8945511751514863184",
-      "--builder-id-json",
-      "{\"bucket\": \"ci\", \"builder\": \"flutter-engine-linux\", \"project\": \"project\"}",
-      "--is-luci",
-      "--buildbot-buildername",
-      "flutter-engine-linux",
-      "--buildbot-slavename",
-      "fake-bot-id"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
-      "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
-    },
-    "name": "postprocess_for_goma (16).upload_log",
-    "timeout": 300,
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"compiler_proxy_log\": \"https://chromium-build-stats.appspot.com/compiler_proxy_log/2017/03/30/build11-m1/compiler_proxy.exe.BUILD11-M1.chrome-bot.log.INFO.20170329-222936.4420.gz\"@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@",
-      "@@@STEP_LINK@compiler_proxy_log@https://chromium-build-stats.appspot.com/compiler_proxy_log/2017/03/30/build11-m1/compiler_proxy.exe.BUILD11-M1.chrome-bot.log.INFO.20170329-222936.4420.gz@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "RECIPE_REPO[build]/scripts/tools/runit.py",
-      "--show-path",
-      "--with-third-party-lib",
-      "--",
-      "python",
-      "RECIPE_MODULE[build::goma]/resources/cloudtail_utils.py",
-      "stop",
-      "--killed-pid-file",
-      "[TMP_BASE]/cloudtail.pid"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
-      "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
-    },
-    "infra_step": true,
-    "name": "postprocess_for_goma (16).stop cloudtail",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
       "[CACHE]/builder/flutter/bin/flutter",
       "config",
       "--no-analytics"
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 ddead2b..64ec4c7 100644
--- a/recipes/dart/flutter_engine.expected/only-run-webtests-suite.json
+++ b/recipes/dart/flutter_engine.expected/only-run-webtests-suite.json
@@ -1177,6 +1177,27 @@
     ]
   },
   {
+    "cmd": [
+      "[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/engine/src/third_party/android_tools/sdk",
+      "GOMA_DIR": "[CACHE]/goma/client"
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "name": "gn --runtime-mode=release"
+  },
+  {
     "cmd": [],
     "name": "preprocess_for_goma (4)"
   },
@@ -1274,8 +1295,7 @@
       "-j",
       "80",
       "-C",
-      "[CACHE]/builder/engine/src/out/host_debug_unopt",
-      "generate_dart_ui"
+      "[CACHE]/builder/engine/src/out/host_release"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1283,7 +1303,7 @@
       "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"
+    "name": "build host_release"
   },
   {
     "cmd": [],
@@ -1399,7 +1419,7 @@
       "--build-exit-status",
       "0",
       "--build-step-name",
-      "build host_debug_unopt generate_dart_ui",
+      "build host_release",
       "--goma-stats-file",
       "[TMP_BASE]/goma_stats",
       "--goma-counterz-file",
@@ -1462,7 +1482,11 @@
   {
     "cmd": [
       "[CACHE]/builder/engine/src/flutter/tools/gn",
-      "--runtime-mode=release"
+      "--fuchsia",
+      "--fuchsia-cpu",
+      "x64",
+      "--runtime-mode=debug",
+      "--no-lto"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1478,7 +1502,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "gn --runtime-mode=release"
+    "name": "gn --fuchsia --fuchsia-cpu x64 --runtime-mode=debug --no-lto"
   },
   {
     "cmd": [],
@@ -1578,7 +1602,9 @@
       "-j",
       "80",
       "-C",
-      "[CACHE]/builder/engine/src/out/host_release"
+      "[CACHE]/builder/engine/src/out/fuchsia_debug_x64",
+      "flutter/shell/platform/fuchsia:fuchsia",
+      "fuchsia_tests"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1586,7 +1612,7 @@
       "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
-    "name": "build host_release"
+    "name": "build fuchsia_debug_x64 flutter/shell/platform/fuchsia:fuchsia fuchsia_tests"
   },
   {
     "cmd": [],
@@ -1702,7 +1728,7 @@
       "--build-exit-status",
       "0",
       "--build-step-name",
-      "build host_release",
+      "build fuchsia_debug_x64 flutter/shell/platform/fuchsia:fuchsia fuchsia_tests",
       "--goma-stats-file",
       "[TMP_BASE]/goma_stats",
       "--goma-counterz-file",
@@ -1764,315 +1790,6 @@
   },
   {
     "cmd": [
-      "[CACHE]/builder/engine/src/flutter/tools/gn",
-      "--fuchsia",
-      "--fuchsia-cpu",
-      "x64",
-      "--runtime-mode=debug",
-      "--no-lto"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
-      "GOMA_DIR": "[CACHE]/goma/client"
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "name": "gn --fuchsia --fuchsia-cpu x64 --runtime-mode=debug --no-lto"
-  },
-  {
-    "cmd": [],
-    "name": "preprocess_for_goma (6)"
-  },
-  {
-    "cmd": [
-      "vpython",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0777",
-      "[CACHE]/goma/data/flutter_engine_linux"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
-      "GOMA_DIR": "[CACHE]/goma/client"
-    },
-    "infra_step": true,
-    "name": "preprocess_for_goma (6).goma cache directory",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "[CACHE]/goma/client/goma_ctl.py",
-      "restart"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "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",
-      "GOMA_DUMP_COUNTERZ_FILE": "[TMP_BASE]/goma_counterz",
-      "GOMA_DUMP_STATS_FILE": "[TMP_BASE]/goma_stats",
-      "GOMA_ENABLE_COUNTERZ": "true",
-      "GOMA_HERMETIC": "error",
-      "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
-    },
-    "infra_step": true,
-    "name": "preprocess_for_goma (6).start_goma",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LINK@cloudtail@https://console.cloud.google.com/logs/viewer?project=goma-logs&resource=gce_instance%2Finstance_id%2Ffakevm999-m9@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "preprocess_for_goma (6).goma_with_global_service_account",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "RECIPE_REPO[build]/scripts/tools/runit.py",
-      "--show-path",
-      "--with-third-party-lib",
-      "--",
-      "python",
-      "RECIPE_MODULE[build::goma]/resources/cloudtail_utils.py",
-      "start",
-      "--cloudtail-path",
-      "cloudtail",
-      "--pid-file",
-      "[TMP_BASE]/cloudtail.pid",
-      "--cloudtail-service-account-json",
-      "/creds/service_accounts/service-account-goma-cloudtail.json"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
-      "GOMA_DIR": "[CACHE]/goma/client"
-    },
-    "infra_step": true,
-    "name": "preprocess_for_goma (6).start cloudtail",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
-      "-j",
-      "80",
-      "-C",
-      "[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/engine/src/third_party/android_tools/sdk",
-      "GOMA_DIR": "[CACHE]/goma/client"
-    },
-    "name": "build fuchsia_debug_x64 flutter/shell/platform/fuchsia:fuchsia fuchsia_tests"
-  },
-  {
-    "cmd": [],
-    "name": "postprocess_for_goma (6)"
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "[CACHE]/goma/client/goma_ctl.py",
-      "jsonstatus",
-      "[TMP_BASE]/goma_jsonstatus.json"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "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",
-      "GOMA_DUMP_COUNTERZ_FILE": "[TMP_BASE]/goma_counterz",
-      "GOMA_DUMP_STATS_FILE": "[TMP_BASE]/goma_stats",
-      "GOMA_ENABLE_COUNTERZ": "true",
-      "GOMA_HERMETIC": "error",
-      "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
-    },
-    "name": "postprocess_for_goma (6).goma_jsonstatus",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"notice\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@    {@@@",
-      "@@@STEP_LOG_LINE@json.output@      \"infra_status\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"num_user_error\": 0, @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"ping_status_code\": 200@@@",
-      "@@@STEP_LOG_LINE@json.output@      }@@@",
-      "@@@STEP_LOG_LINE@json.output@    }@@@",
-      "@@@STEP_LOG_LINE@json.output@  ]@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "[CACHE]/goma/client/goma_ctl.py",
-      "stat"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "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",
-      "GOMA_DUMP_COUNTERZ_FILE": "[TMP_BASE]/goma_counterz",
-      "GOMA_DUMP_STATS_FILE": "[TMP_BASE]/goma_stats",
-      "GOMA_ENABLE_COUNTERZ": "true",
-      "GOMA_HERMETIC": "error",
-      "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
-    },
-    "name": "postprocess_for_goma (6).goma_stat",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "[CACHE]/goma/client/goma_ctl.py",
-      "stop"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "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",
-      "GOMA_DUMP_COUNTERZ_FILE": "[TMP_BASE]/goma_counterz",
-      "GOMA_DUMP_STATS_FILE": "[TMP_BASE]/goma_stats",
-      "GOMA_ENABLE_COUNTERZ": "true",
-      "GOMA_HERMETIC": "error",
-      "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
-    },
-    "name": "postprocess_for_goma (6).stop_goma",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython",
-      "-u",
-      "RECIPE_REPO[build]/scripts/tools/runit.py",
-      "--show-path",
-      "--",
-      "python",
-      "RECIPE_REPO[build]/recipes/upload_goma_logs.py",
-      "--upload-compiler-proxy-info",
-      "--log-url-json-file",
-      "/path/to/tmp/json",
-      "--gsutil-py-path",
-      "RECIPE_REPO[depot_tools]/gsutil.py",
-      "--bqupload-path",
-      "[CACHE]/goma/bqupload/bqupload",
-      "--bigquery-service-account-json",
-      "/creds/service_accounts/service-account-goma-bigquery.json",
-      "--json-status",
-      "[TMP_BASE]/goma_jsonstatus.json",
-      "--build-exit-status",
-      "0",
-      "--build-step-name",
-      "build fuchsia_debug_x64 flutter/shell/platform/fuchsia:fuchsia fuchsia_tests",
-      "--goma-stats-file",
-      "[TMP_BASE]/goma_stats",
-      "--goma-counterz-file",
-      "[TMP_BASE]/goma_counterz",
-      "--goma-crash-report-id-file",
-      "[TMP_BASE]/crash_report_id",
-      "--build-id",
-      "8945511751514863184",
-      "--builder-id-json",
-      "{\"bucket\": \"ci\", \"builder\": \"flutter-engine-linux\", \"project\": \"project\"}",
-      "--is-luci",
-      "--buildbot-buildername",
-      "flutter-engine-linux",
-      "--buildbot-slavename",
-      "fake-bot-id"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
-      "GOMA_DIR": "[CACHE]/goma/client"
-    },
-    "name": "postprocess_for_goma (6).upload_log",
-    "timeout": 300,
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"compiler_proxy_log\": \"https://chromium-build-stats.appspot.com/compiler_proxy_log/2017/03/30/build11-m1/compiler_proxy.exe.BUILD11-M1.chrome-bot.log.INFO.20170329-222936.4420.gz\"@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@",
-      "@@@STEP_LINK@compiler_proxy_log@https://chromium-build-stats.appspot.com/compiler_proxy_log/2017/03/30/build11-m1/compiler_proxy.exe.BUILD11-M1.chrome-bot.log.INFO.20170329-222936.4420.gz@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "RECIPE_REPO[build]/scripts/tools/runit.py",
-      "--show-path",
-      "--with-third-party-lib",
-      "--",
-      "python",
-      "RECIPE_MODULE[build::goma]/resources/cloudtail_utils.py",
-      "stop",
-      "--killed-pid-file",
-      "[TMP_BASE]/cloudtail.pid"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
-      "GOMA_DIR": "[CACHE]/goma/client"
-    },
-    "infra_step": true,
-    "name": "postprocess_for_goma (6).stop cloudtail",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
       "vpython",
       "-u",
       "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
@@ -2212,6 +1929,297 @@
   },
   {
     "cmd": [],
+    "name": "preprocess_for_goma (6)"
+  },
+  {
+    "cmd": [
+      "vpython",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "ensure-directory",
+      "--mode",
+      "0777",
+      "[CACHE]/goma/data/flutter_engine_linux"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "GOMA_DIR": "[CACHE]/goma/client",
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+    },
+    "infra_step": true,
+    "name": "preprocess_for_goma (6).goma cache directory",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "[CACHE]/goma/client/goma_ctl.py",
+      "restart"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
+      "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",
+      "GOMA_DUMP_COUNTERZ_FILE": "[TMP_BASE]/goma_counterz",
+      "GOMA_DUMP_STATS_FILE": "[TMP_BASE]/goma_stats",
+      "GOMA_ENABLE_COUNTERZ": "true",
+      "GOMA_HERMETIC": "error",
+      "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+    },
+    "infra_step": true,
+    "name": "preprocess_for_goma (6).start_goma",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LINK@cloudtail@https://console.cloud.google.com/logs/viewer?project=goma-logs&resource=gce_instance%2Finstance_id%2Ffakevm999-m9@@@"
+    ]
+  },
+  {
+    "cmd": [],
+    "name": "preprocess_for_goma (6).goma_with_global_service_account",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "RECIPE_REPO[build]/scripts/tools/runit.py",
+      "--show-path",
+      "--with-third-party-lib",
+      "--",
+      "python",
+      "RECIPE_MODULE[build::goma]/resources/cloudtail_utils.py",
+      "start",
+      "--cloudtail-path",
+      "cloudtail",
+      "--pid-file",
+      "[TMP_BASE]/cloudtail.pid",
+      "--cloudtail-service-account-json",
+      "/creds/service_accounts/service-account-goma-cloudtail.json"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "GOMA_DIR": "[CACHE]/goma/client",
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+    },
+    "infra_step": true,
+    "name": "preprocess_for_goma (6).start cloudtail",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "RECIPE_REPO[depot_tools]/ninja",
+      "-j",
+      "80",
+      "-C",
+      "[CACHE]/builder/engine/src/out/android_debug"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "GOMA_DIR": "[CACHE]/goma/client",
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+    },
+    "name": "build android_debug"
+  },
+  {
+    "cmd": [],
+    "name": "postprocess_for_goma (6)"
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "[CACHE]/goma/client/goma_ctl.py",
+      "jsonstatus",
+      "[TMP_BASE]/goma_jsonstatus.json"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
+      "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",
+      "GOMA_DUMP_COUNTERZ_FILE": "[TMP_BASE]/goma_counterz",
+      "GOMA_DUMP_STATS_FILE": "[TMP_BASE]/goma_stats",
+      "GOMA_ENABLE_COUNTERZ": "true",
+      "GOMA_HERMETIC": "error",
+      "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+    },
+    "name": "postprocess_for_goma (6).goma_jsonstatus",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"notice\": [@@@",
+      "@@@STEP_LOG_LINE@json.output@    {@@@",
+      "@@@STEP_LOG_LINE@json.output@      \"infra_status\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"num_user_error\": 0, @@@",
+      "@@@STEP_LOG_LINE@json.output@        \"ping_status_code\": 200@@@",
+      "@@@STEP_LOG_LINE@json.output@      }@@@",
+      "@@@STEP_LOG_LINE@json.output@    }@@@",
+      "@@@STEP_LOG_LINE@json.output@  ]@@@",
+      "@@@STEP_LOG_LINE@json.output@}@@@",
+      "@@@STEP_LOG_END@json.output@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "[CACHE]/goma/client/goma_ctl.py",
+      "stat"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
+      "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",
+      "GOMA_DUMP_COUNTERZ_FILE": "[TMP_BASE]/goma_counterz",
+      "GOMA_DUMP_STATS_FILE": "[TMP_BASE]/goma_stats",
+      "GOMA_ENABLE_COUNTERZ": "true",
+      "GOMA_HERMETIC": "error",
+      "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+    },
+    "name": "postprocess_for_goma (6).goma_stat",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "[CACHE]/goma/client/goma_ctl.py",
+      "stop"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
+      "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",
+      "GOMA_DUMP_COUNTERZ_FILE": "[TMP_BASE]/goma_counterz",
+      "GOMA_DUMP_STATS_FILE": "[TMP_BASE]/goma_stats",
+      "GOMA_ENABLE_COUNTERZ": "true",
+      "GOMA_HERMETIC": "error",
+      "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+    },
+    "name": "postprocess_for_goma (6).stop_goma",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "vpython",
+      "-u",
+      "RECIPE_REPO[build]/scripts/tools/runit.py",
+      "--show-path",
+      "--",
+      "python",
+      "RECIPE_REPO[build]/recipes/upload_goma_logs.py",
+      "--upload-compiler-proxy-info",
+      "--log-url-json-file",
+      "/path/to/tmp/json",
+      "--gsutil-py-path",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "--bqupload-path",
+      "[CACHE]/goma/bqupload/bqupload",
+      "--bigquery-service-account-json",
+      "/creds/service_accounts/service-account-goma-bigquery.json",
+      "--json-status",
+      "[TMP_BASE]/goma_jsonstatus.json",
+      "--build-exit-status",
+      "0",
+      "--build-step-name",
+      "build android_debug",
+      "--goma-stats-file",
+      "[TMP_BASE]/goma_stats",
+      "--goma-counterz-file",
+      "[TMP_BASE]/goma_counterz",
+      "--goma-crash-report-id-file",
+      "[TMP_BASE]/crash_report_id",
+      "--build-id",
+      "8945511751514863184",
+      "--builder-id-json",
+      "{\"bucket\": \"ci\", \"builder\": \"flutter-engine-linux\", \"project\": \"project\"}",
+      "--is-luci",
+      "--buildbot-buildername",
+      "flutter-engine-linux",
+      "--buildbot-slavename",
+      "fake-bot-id"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "GOMA_DIR": "[CACHE]/goma/client",
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+    },
+    "name": "postprocess_for_goma (6).upload_log",
+    "timeout": 300,
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"compiler_proxy_log\": \"https://chromium-build-stats.appspot.com/compiler_proxy_log/2017/03/30/build11-m1/compiler_proxy.exe.BUILD11-M1.chrome-bot.log.INFO.20170329-222936.4420.gz\"@@@",
+      "@@@STEP_LOG_LINE@json.output@}@@@",
+      "@@@STEP_LOG_END@json.output@@@",
+      "@@@STEP_LINK@compiler_proxy_log@https://chromium-build-stats.appspot.com/compiler_proxy_log/2017/03/30/build11-m1/compiler_proxy.exe.BUILD11-M1.chrome-bot.log.INFO.20170329-222936.4420.gz@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "RECIPE_REPO[build]/scripts/tools/runit.py",
+      "--show-path",
+      "--with-third-party-lib",
+      "--",
+      "python",
+      "RECIPE_MODULE[build::goma]/resources/cloudtail_utils.py",
+      "stop",
+      "--killed-pid-file",
+      "[TMP_BASE]/cloudtail.pid"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "GOMA_DIR": "[CACHE]/goma/client",
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+    },
+    "infra_step": true,
+    "name": "postprocess_for_goma (6).stop cloudtail",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [],
     "name": "preprocess_for_goma (7)"
   },
   {
@@ -2311,7 +2319,8 @@
       "-j",
       "80",
       "-C",
-      "[CACHE]/builder/engine/src/out/android_debug"
+      "[CACHE]/builder/engine/src/out/android_debug",
+      ":dist"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -2320,7 +2329,7 @@
       "GOMA_DIR": "[CACHE]/goma/client",
       "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
-    "name": "build android_debug"
+    "name": "build android_debug :dist"
   },
   {
     "cmd": [],
@@ -2439,7 +2448,7 @@
       "--build-exit-status",
       "0",
       "--build-step-name",
-      "build android_debug",
+      "build android_debug :dist",
       "--goma-stats-file",
       "[TMP_BASE]/goma_stats",
       "--goma-counterz-file",
@@ -2502,6 +2511,30 @@
     ]
   },
   {
+    "cmd": [
+      "[CACHE]/builder/engine/src/flutter/tools/gn",
+      "--android",
+      "--runtime-mode=profile",
+      "--android-cpu=arm"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "GOMA_DIR": "[CACHE]/goma/client",
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "name": "gn --android --runtime-mode=profile --android-cpu=arm"
+  },
+  {
     "cmd": [],
     "name": "preprocess_for_goma (8)"
   },
@@ -2602,8 +2635,7 @@
       "-j",
       "80",
       "-C",
-      "[CACHE]/builder/engine/src/out/android_debug",
-      ":dist"
+      "[CACHE]/builder/engine/src/out/android_profile"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -2612,7 +2644,7 @@
       "GOMA_DIR": "[CACHE]/goma/client",
       "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
-    "name": "build android_debug :dist"
+    "name": "build android_profile"
   },
   {
     "cmd": [],
@@ -2731,7 +2763,7 @@
       "--build-exit-status",
       "0",
       "--build-step-name",
-      "build android_debug :dist",
+      "build android_profile",
       "--goma-stats-file",
       "[TMP_BASE]/goma_stats",
       "--goma-counterz-file",
@@ -2797,7 +2829,7 @@
     "cmd": [
       "[CACHE]/builder/engine/src/flutter/tools/gn",
       "--android",
-      "--runtime-mode=profile",
+      "--runtime-mode=release",
       "--android-cpu=arm"
     ],
     "cwd": "[CACHE]/builder",
@@ -2815,7 +2847,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "gn --android --runtime-mode=profile --android-cpu=arm"
+    "name": "gn --android --runtime-mode=release --android-cpu=arm"
   },
   {
     "cmd": [],
@@ -2918,7 +2950,7 @@
       "-j",
       "80",
       "-C",
-      "[CACHE]/builder/engine/src/out/android_profile"
+      "[CACHE]/builder/engine/src/out/android_release"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -2927,7 +2959,7 @@
       "GOMA_DIR": "[CACHE]/goma/client",
       "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
-    "name": "build android_profile"
+    "name": "build android_release"
   },
   {
     "cmd": [],
@@ -3046,7 +3078,7 @@
       "--build-exit-status",
       "0",
       "--build-step-name",
-      "build android_profile",
+      "build android_release",
       "--goma-stats-file",
       "[TMP_BASE]/goma_stats",
       "--goma-counterz-file",
@@ -3112,8 +3144,8 @@
     "cmd": [
       "[CACHE]/builder/engine/src/flutter/tools/gn",
       "--android",
-      "--runtime-mode=release",
-      "--android-cpu=arm"
+      "--runtime-mode=profile",
+      "--android-cpu=arm64"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -3130,7 +3162,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "gn --android --runtime-mode=release --android-cpu=arm"
+    "name": "gn --android --runtime-mode=profile --android-cpu=arm64"
   },
   {
     "cmd": [],
@@ -3233,7 +3265,7 @@
       "-j",
       "80",
       "-C",
-      "[CACHE]/builder/engine/src/out/android_release"
+      "[CACHE]/builder/engine/src/out/android_profile_arm64"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -3242,7 +3274,7 @@
       "GOMA_DIR": "[CACHE]/goma/client",
       "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
-    "name": "build android_release"
+    "name": "build android_profile_arm64"
   },
   {
     "cmd": [],
@@ -3361,7 +3393,7 @@
       "--build-exit-status",
       "0",
       "--build-step-name",
-      "build android_release",
+      "build android_profile_arm64",
       "--goma-stats-file",
       "[TMP_BASE]/goma_stats",
       "--goma-counterz-file",
@@ -3427,7 +3459,7 @@
     "cmd": [
       "[CACHE]/builder/engine/src/flutter/tools/gn",
       "--android",
-      "--runtime-mode=profile",
+      "--runtime-mode=release",
       "--android-cpu=arm64"
     ],
     "cwd": "[CACHE]/builder",
@@ -3445,7 +3477,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "gn --android --runtime-mode=profile --android-cpu=arm64"
+    "name": "gn --android --runtime-mode=release --android-cpu=arm64"
   },
   {
     "cmd": [],
@@ -3548,7 +3580,7 @@
       "-j",
       "80",
       "-C",
-      "[CACHE]/builder/engine/src/out/android_profile_arm64"
+      "[CACHE]/builder/engine/src/out/android_release_arm64"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -3557,7 +3589,7 @@
       "GOMA_DIR": "[CACHE]/goma/client",
       "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
-    "name": "build android_profile_arm64"
+    "name": "build android_release_arm64"
   },
   {
     "cmd": [],
@@ -3676,7 +3708,7 @@
       "--build-exit-status",
       "0",
       "--build-step-name",
-      "build android_profile_arm64",
+      "build android_release_arm64",
       "--goma-stats-file",
       "[TMP_BASE]/goma_stats",
       "--goma-counterz-file",
@@ -3742,8 +3774,8 @@
     "cmd": [
       "[CACHE]/builder/engine/src/flutter/tools/gn",
       "--android",
-      "--runtime-mode=release",
-      "--android-cpu=arm64"
+      "--runtime-mode=profile",
+      "--android-cpu=x64"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -3760,7 +3792,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "gn --android --runtime-mode=release --android-cpu=arm64"
+    "name": "gn --android --runtime-mode=profile --android-cpu=x64"
   },
   {
     "cmd": [],
@@ -3863,7 +3895,7 @@
       "-j",
       "80",
       "-C",
-      "[CACHE]/builder/engine/src/out/android_release_arm64"
+      "[CACHE]/builder/engine/src/out/android_profile_x64"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -3872,7 +3904,7 @@
       "GOMA_DIR": "[CACHE]/goma/client",
       "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
-    "name": "build android_release_arm64"
+    "name": "build android_profile_x64"
   },
   {
     "cmd": [],
@@ -3991,7 +4023,7 @@
       "--build-exit-status",
       "0",
       "--build-step-name",
-      "build android_release_arm64",
+      "build android_profile_x64",
       "--goma-stats-file",
       "[TMP_BASE]/goma_stats",
       "--goma-counterz-file",
@@ -4057,7 +4089,7 @@
     "cmd": [
       "[CACHE]/builder/engine/src/flutter/tools/gn",
       "--android",
-      "--runtime-mode=profile",
+      "--runtime-mode=release",
       "--android-cpu=x64"
     ],
     "cwd": "[CACHE]/builder",
@@ -4075,7 +4107,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "gn --android --runtime-mode=profile --android-cpu=x64"
+    "name": "gn --android --runtime-mode=release --android-cpu=x64"
   },
   {
     "cmd": [],
@@ -4178,7 +4210,7 @@
       "-j",
       "80",
       "-C",
-      "[CACHE]/builder/engine/src/out/android_profile_x64"
+      "[CACHE]/builder/engine/src/out/android_release_x64"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -4187,7 +4219,7 @@
       "GOMA_DIR": "[CACHE]/goma/client",
       "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
-    "name": "build android_profile_x64"
+    "name": "build android_release_x64"
   },
   {
     "cmd": [],
@@ -4306,7 +4338,7 @@
       "--build-exit-status",
       "0",
       "--build-step-name",
-      "build android_profile_x64",
+      "build android_release_x64",
       "--goma-stats-file",
       "[TMP_BASE]/goma_stats",
       "--goma-counterz-file",
@@ -4372,8 +4404,8 @@
     "cmd": [
       "[CACHE]/builder/engine/src/flutter/tools/gn",
       "--android",
-      "--runtime-mode=release",
-      "--android-cpu=x64"
+      "--android-cpu=x64",
+      "--no-lto"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -4390,7 +4422,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "gn --android --runtime-mode=release --android-cpu=x64"
+    "name": "gn --android --android-cpu=x64 --no-lto"
   },
   {
     "cmd": [],
@@ -4493,7 +4525,7 @@
       "-j",
       "80",
       "-C",
-      "[CACHE]/builder/engine/src/out/android_release_x64"
+      "[CACHE]/builder/engine/src/out/android_debug_x64"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -4502,7 +4534,7 @@
       "GOMA_DIR": "[CACHE]/goma/client",
       "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
-    "name": "build android_release_x64"
+    "name": "build android_debug_x64"
   },
   {
     "cmd": [],
@@ -4621,7 +4653,7 @@
       "--build-exit-status",
       "0",
       "--build-step-name",
-      "build android_release_x64",
+      "build android_debug_x64",
       "--goma-stats-file",
       "[TMP_BASE]/goma_stats",
       "--goma-counterz-file",
@@ -4687,7 +4719,7 @@
     "cmd": [
       "[CACHE]/builder/engine/src/flutter/tools/gn",
       "--android",
-      "--android-cpu=x64",
+      "--android-cpu=x86",
       "--no-lto"
     ],
     "cwd": "[CACHE]/builder",
@@ -4705,7 +4737,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "gn --android --android-cpu=x64 --no-lto"
+    "name": "gn --android --android-cpu=x86 --no-lto"
   },
   {
     "cmd": [],
@@ -4808,7 +4840,7 @@
       "-j",
       "80",
       "-C",
-      "[CACHE]/builder/engine/src/out/android_debug_x64"
+      "[CACHE]/builder/engine/src/out/android_debug_x86"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -4817,7 +4849,7 @@
       "GOMA_DIR": "[CACHE]/goma/client",
       "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
-    "name": "build android_debug_x64"
+    "name": "build android_debug_x86"
   },
   {
     "cmd": [],
@@ -4936,7 +4968,7 @@
       "--build-exit-status",
       "0",
       "--build-step-name",
-      "build android_debug_x64",
+      "build android_debug_x86",
       "--goma-stats-file",
       "[TMP_BASE]/goma_stats",
       "--goma-counterz-file",
@@ -5000,321 +5032,6 @@
   },
   {
     "cmd": [
-      "[CACHE]/builder/engine/src/flutter/tools/gn",
-      "--android",
-      "--android-cpu=x86",
-      "--no-lto"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
-      "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "name": "gn --android --android-cpu=x86 --no-lto"
-  },
-  {
-    "cmd": [],
-    "name": "preprocess_for_goma (16)"
-  },
-  {
-    "cmd": [
-      "vpython",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0777",
-      "[CACHE]/goma/data/flutter_engine_linux"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
-      "GOMA_DIR": "[CACHE]/goma/client",
-      "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",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "[CACHE]/goma/client/goma_ctl.py",
-      "restart"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "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",
-      "GOMA_DUMP_COUNTERZ_FILE": "[TMP_BASE]/goma_counterz",
-      "GOMA_DUMP_STATS_FILE": "[TMP_BASE]/goma_stats",
-      "GOMA_ENABLE_COUNTERZ": "true",
-      "GOMA_HERMETIC": "error",
-      "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
-    },
-    "infra_step": true,
-    "name": "preprocess_for_goma (16).start_goma",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LINK@cloudtail@https://console.cloud.google.com/logs/viewer?project=goma-logs&resource=gce_instance%2Finstance_id%2Ffakevm999-m9@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "preprocess_for_goma (16).goma_with_global_service_account",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "RECIPE_REPO[build]/scripts/tools/runit.py",
-      "--show-path",
-      "--with-third-party-lib",
-      "--",
-      "python",
-      "RECIPE_MODULE[build::goma]/resources/cloudtail_utils.py",
-      "start",
-      "--cloudtail-path",
-      "cloudtail",
-      "--pid-file",
-      "[TMP_BASE]/cloudtail.pid",
-      "--cloudtail-service-account-json",
-      "/creds/service_accounts/service-account-goma-cloudtail.json"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
-      "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
-    },
-    "infra_step": true,
-    "name": "preprocess_for_goma (16).start cloudtail",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
-      "-j",
-      "80",
-      "-C",
-      "[CACHE]/builder/engine/src/out/android_debug_x86"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
-      "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
-    },
-    "name": "build android_debug_x86"
-  },
-  {
-    "cmd": [],
-    "name": "postprocess_for_goma (16)"
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "[CACHE]/goma/client/goma_ctl.py",
-      "jsonstatus",
-      "[TMP_BASE]/goma_jsonstatus.json"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "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",
-      "GOMA_DUMP_COUNTERZ_FILE": "[TMP_BASE]/goma_counterz",
-      "GOMA_DUMP_STATS_FILE": "[TMP_BASE]/goma_stats",
-      "GOMA_ENABLE_COUNTERZ": "true",
-      "GOMA_HERMETIC": "error",
-      "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
-    },
-    "name": "postprocess_for_goma (16).goma_jsonstatus",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"notice\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@    {@@@",
-      "@@@STEP_LOG_LINE@json.output@      \"infra_status\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"num_user_error\": 0, @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"ping_status_code\": 200@@@",
-      "@@@STEP_LOG_LINE@json.output@      }@@@",
-      "@@@STEP_LOG_LINE@json.output@    }@@@",
-      "@@@STEP_LOG_LINE@json.output@  ]@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "[CACHE]/goma/client/goma_ctl.py",
-      "stat"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "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",
-      "GOMA_DUMP_COUNTERZ_FILE": "[TMP_BASE]/goma_counterz",
-      "GOMA_DUMP_STATS_FILE": "[TMP_BASE]/goma_stats",
-      "GOMA_ENABLE_COUNTERZ": "true",
-      "GOMA_HERMETIC": "error",
-      "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
-    },
-    "name": "postprocess_for_goma (16).goma_stat",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "[CACHE]/goma/client/goma_ctl.py",
-      "stop"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "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",
-      "GOMA_DUMP_COUNTERZ_FILE": "[TMP_BASE]/goma_counterz",
-      "GOMA_DUMP_STATS_FILE": "[TMP_BASE]/goma_stats",
-      "GOMA_ENABLE_COUNTERZ": "true",
-      "GOMA_HERMETIC": "error",
-      "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
-    },
-    "name": "postprocess_for_goma (16).stop_goma",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython",
-      "-u",
-      "RECIPE_REPO[build]/scripts/tools/runit.py",
-      "--show-path",
-      "--",
-      "python",
-      "RECIPE_REPO[build]/recipes/upload_goma_logs.py",
-      "--upload-compiler-proxy-info",
-      "--log-url-json-file",
-      "/path/to/tmp/json",
-      "--gsutil-py-path",
-      "RECIPE_REPO[depot_tools]/gsutil.py",
-      "--bqupload-path",
-      "[CACHE]/goma/bqupload/bqupload",
-      "--bigquery-service-account-json",
-      "/creds/service_accounts/service-account-goma-bigquery.json",
-      "--json-status",
-      "[TMP_BASE]/goma_jsonstatus.json",
-      "--build-exit-status",
-      "0",
-      "--build-step-name",
-      "build android_debug_x86",
-      "--goma-stats-file",
-      "[TMP_BASE]/goma_stats",
-      "--goma-counterz-file",
-      "[TMP_BASE]/goma_counterz",
-      "--goma-crash-report-id-file",
-      "[TMP_BASE]/crash_report_id",
-      "--build-id",
-      "8945511751514863184",
-      "--builder-id-json",
-      "{\"bucket\": \"ci\", \"builder\": \"flutter-engine-linux\", \"project\": \"project\"}",
-      "--is-luci",
-      "--buildbot-buildername",
-      "flutter-engine-linux",
-      "--buildbot-slavename",
-      "fake-bot-id"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
-      "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
-    },
-    "name": "postprocess_for_goma (16).upload_log",
-    "timeout": 300,
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"compiler_proxy_log\": \"https://chromium-build-stats.appspot.com/compiler_proxy_log/2017/03/30/build11-m1/compiler_proxy.exe.BUILD11-M1.chrome-bot.log.INFO.20170329-222936.4420.gz\"@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@",
-      "@@@STEP_LINK@compiler_proxy_log@https://chromium-build-stats.appspot.com/compiler_proxy_log/2017/03/30/build11-m1/compiler_proxy.exe.BUILD11-M1.chrome-bot.log.INFO.20170329-222936.4420.gz@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "RECIPE_REPO[build]/scripts/tools/runit.py",
-      "--show-path",
-      "--with-third-party-lib",
-      "--",
-      "python",
-      "RECIPE_MODULE[build::goma]/resources/cloudtail_utils.py",
-      "stop",
-      "--killed-pid-file",
-      "[TMP_BASE]/cloudtail.pid"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
-      "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
-    },
-    "infra_step": true,
-    "name": "postprocess_for_goma (16).stop cloudtail",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
       "[CACHE]/builder/flutter/bin/flutter",
       "config",
       "--no-analytics"
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 d89c3bc..f408834 100644
--- a/recipes/dart/flutter_engine.expected/run-all-test-suites.json
+++ b/recipes/dart/flutter_engine.expected/run-all-test-suites.json
@@ -1177,6 +1177,27 @@
     ]
   },
   {
+    "cmd": [
+      "[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/engine/src/third_party/android_tools/sdk",
+      "GOMA_DIR": "[CACHE]/goma/client"
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "name": "gn --runtime-mode=release"
+  },
+  {
     "cmd": [],
     "name": "preprocess_for_goma (4)"
   },
@@ -1274,8 +1295,7 @@
       "-j",
       "80",
       "-C",
-      "[CACHE]/builder/engine/src/out/host_debug_unopt",
-      "generate_dart_ui"
+      "[CACHE]/builder/engine/src/out/host_release"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1283,7 +1303,7 @@
       "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"
+    "name": "build host_release"
   },
   {
     "cmd": [],
@@ -1399,7 +1419,7 @@
       "--build-exit-status",
       "0",
       "--build-step-name",
-      "build host_debug_unopt generate_dart_ui",
+      "build host_release",
       "--goma-stats-file",
       "[TMP_BASE]/goma_stats",
       "--goma-counterz-file",
@@ -1462,7 +1482,11 @@
   {
     "cmd": [
       "[CACHE]/builder/engine/src/flutter/tools/gn",
-      "--runtime-mode=release"
+      "--fuchsia",
+      "--fuchsia-cpu",
+      "x64",
+      "--runtime-mode=debug",
+      "--no-lto"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1478,7 +1502,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "gn --runtime-mode=release"
+    "name": "gn --fuchsia --fuchsia-cpu x64 --runtime-mode=debug --no-lto"
   },
   {
     "cmd": [],
@@ -1578,7 +1602,9 @@
       "-j",
       "80",
       "-C",
-      "[CACHE]/builder/engine/src/out/host_release"
+      "[CACHE]/builder/engine/src/out/fuchsia_debug_x64",
+      "flutter/shell/platform/fuchsia:fuchsia",
+      "fuchsia_tests"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1586,7 +1612,7 @@
       "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
-    "name": "build host_release"
+    "name": "build fuchsia_debug_x64 flutter/shell/platform/fuchsia:fuchsia fuchsia_tests"
   },
   {
     "cmd": [],
@@ -1702,7 +1728,7 @@
       "--build-exit-status",
       "0",
       "--build-step-name",
-      "build host_release",
+      "build fuchsia_debug_x64 flutter/shell/platform/fuchsia:fuchsia fuchsia_tests",
       "--goma-stats-file",
       "[TMP_BASE]/goma_stats",
       "--goma-counterz-file",
@@ -1764,315 +1790,6 @@
   },
   {
     "cmd": [
-      "[CACHE]/builder/engine/src/flutter/tools/gn",
-      "--fuchsia",
-      "--fuchsia-cpu",
-      "x64",
-      "--runtime-mode=debug",
-      "--no-lto"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
-      "GOMA_DIR": "[CACHE]/goma/client"
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "name": "gn --fuchsia --fuchsia-cpu x64 --runtime-mode=debug --no-lto"
-  },
-  {
-    "cmd": [],
-    "name": "preprocess_for_goma (6)"
-  },
-  {
-    "cmd": [
-      "vpython",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0777",
-      "[CACHE]/goma/data/flutter_engine_linux"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
-      "GOMA_DIR": "[CACHE]/goma/client"
-    },
-    "infra_step": true,
-    "name": "preprocess_for_goma (6).goma cache directory",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "[CACHE]/goma/client/goma_ctl.py",
-      "restart"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "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",
-      "GOMA_DUMP_COUNTERZ_FILE": "[TMP_BASE]/goma_counterz",
-      "GOMA_DUMP_STATS_FILE": "[TMP_BASE]/goma_stats",
-      "GOMA_ENABLE_COUNTERZ": "true",
-      "GOMA_HERMETIC": "error",
-      "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
-    },
-    "infra_step": true,
-    "name": "preprocess_for_goma (6).start_goma",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LINK@cloudtail@https://console.cloud.google.com/logs/viewer?project=goma-logs&resource=gce_instance%2Finstance_id%2Ffakevm999-m9@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "preprocess_for_goma (6).goma_with_global_service_account",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "RECIPE_REPO[build]/scripts/tools/runit.py",
-      "--show-path",
-      "--with-third-party-lib",
-      "--",
-      "python",
-      "RECIPE_MODULE[build::goma]/resources/cloudtail_utils.py",
-      "start",
-      "--cloudtail-path",
-      "cloudtail",
-      "--pid-file",
-      "[TMP_BASE]/cloudtail.pid",
-      "--cloudtail-service-account-json",
-      "/creds/service_accounts/service-account-goma-cloudtail.json"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
-      "GOMA_DIR": "[CACHE]/goma/client"
-    },
-    "infra_step": true,
-    "name": "preprocess_for_goma (6).start cloudtail",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
-      "-j",
-      "80",
-      "-C",
-      "[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/engine/src/third_party/android_tools/sdk",
-      "GOMA_DIR": "[CACHE]/goma/client"
-    },
-    "name": "build fuchsia_debug_x64 flutter/shell/platform/fuchsia:fuchsia fuchsia_tests"
-  },
-  {
-    "cmd": [],
-    "name": "postprocess_for_goma (6)"
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "[CACHE]/goma/client/goma_ctl.py",
-      "jsonstatus",
-      "[TMP_BASE]/goma_jsonstatus.json"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "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",
-      "GOMA_DUMP_COUNTERZ_FILE": "[TMP_BASE]/goma_counterz",
-      "GOMA_DUMP_STATS_FILE": "[TMP_BASE]/goma_stats",
-      "GOMA_ENABLE_COUNTERZ": "true",
-      "GOMA_HERMETIC": "error",
-      "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
-    },
-    "name": "postprocess_for_goma (6).goma_jsonstatus",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"notice\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@    {@@@",
-      "@@@STEP_LOG_LINE@json.output@      \"infra_status\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"num_user_error\": 0, @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"ping_status_code\": 200@@@",
-      "@@@STEP_LOG_LINE@json.output@      }@@@",
-      "@@@STEP_LOG_LINE@json.output@    }@@@",
-      "@@@STEP_LOG_LINE@json.output@  ]@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "[CACHE]/goma/client/goma_ctl.py",
-      "stat"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "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",
-      "GOMA_DUMP_COUNTERZ_FILE": "[TMP_BASE]/goma_counterz",
-      "GOMA_DUMP_STATS_FILE": "[TMP_BASE]/goma_stats",
-      "GOMA_ENABLE_COUNTERZ": "true",
-      "GOMA_HERMETIC": "error",
-      "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
-    },
-    "name": "postprocess_for_goma (6).goma_stat",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "[CACHE]/goma/client/goma_ctl.py",
-      "stop"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "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",
-      "GOMA_DUMP_COUNTERZ_FILE": "[TMP_BASE]/goma_counterz",
-      "GOMA_DUMP_STATS_FILE": "[TMP_BASE]/goma_stats",
-      "GOMA_ENABLE_COUNTERZ": "true",
-      "GOMA_HERMETIC": "error",
-      "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
-    },
-    "name": "postprocess_for_goma (6).stop_goma",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython",
-      "-u",
-      "RECIPE_REPO[build]/scripts/tools/runit.py",
-      "--show-path",
-      "--",
-      "python",
-      "RECIPE_REPO[build]/recipes/upload_goma_logs.py",
-      "--upload-compiler-proxy-info",
-      "--log-url-json-file",
-      "/path/to/tmp/json",
-      "--gsutil-py-path",
-      "RECIPE_REPO[depot_tools]/gsutil.py",
-      "--bqupload-path",
-      "[CACHE]/goma/bqupload/bqupload",
-      "--bigquery-service-account-json",
-      "/creds/service_accounts/service-account-goma-bigquery.json",
-      "--json-status",
-      "[TMP_BASE]/goma_jsonstatus.json",
-      "--build-exit-status",
-      "0",
-      "--build-step-name",
-      "build fuchsia_debug_x64 flutter/shell/platform/fuchsia:fuchsia fuchsia_tests",
-      "--goma-stats-file",
-      "[TMP_BASE]/goma_stats",
-      "--goma-counterz-file",
-      "[TMP_BASE]/goma_counterz",
-      "--goma-crash-report-id-file",
-      "[TMP_BASE]/crash_report_id",
-      "--build-id",
-      "8945511751514863184",
-      "--builder-id-json",
-      "{\"bucket\": \"ci\", \"builder\": \"flutter-engine-linux\", \"project\": \"project\"}",
-      "--is-luci",
-      "--buildbot-buildername",
-      "flutter-engine-linux",
-      "--buildbot-slavename",
-      "fake-bot-id"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
-      "GOMA_DIR": "[CACHE]/goma/client"
-    },
-    "name": "postprocess_for_goma (6).upload_log",
-    "timeout": 300,
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"compiler_proxy_log\": \"https://chromium-build-stats.appspot.com/compiler_proxy_log/2017/03/30/build11-m1/compiler_proxy.exe.BUILD11-M1.chrome-bot.log.INFO.20170329-222936.4420.gz\"@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@",
-      "@@@STEP_LINK@compiler_proxy_log@https://chromium-build-stats.appspot.com/compiler_proxy_log/2017/03/30/build11-m1/compiler_proxy.exe.BUILD11-M1.chrome-bot.log.INFO.20170329-222936.4420.gz@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "RECIPE_REPO[build]/scripts/tools/runit.py",
-      "--show-path",
-      "--with-third-party-lib",
-      "--",
-      "python",
-      "RECIPE_MODULE[build::goma]/resources/cloudtail_utils.py",
-      "stop",
-      "--killed-pid-file",
-      "[TMP_BASE]/cloudtail.pid"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
-      "GOMA_DIR": "[CACHE]/goma/client"
-    },
-    "infra_step": true,
-    "name": "postprocess_for_goma (6).stop cloudtail",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
       "vpython",
       "-u",
       "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
@@ -2212,6 +1929,297 @@
   },
   {
     "cmd": [],
+    "name": "preprocess_for_goma (6)"
+  },
+  {
+    "cmd": [
+      "vpython",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "ensure-directory",
+      "--mode",
+      "0777",
+      "[CACHE]/goma/data/flutter_engine_linux"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "GOMA_DIR": "[CACHE]/goma/client",
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+    },
+    "infra_step": true,
+    "name": "preprocess_for_goma (6).goma cache directory",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "[CACHE]/goma/client/goma_ctl.py",
+      "restart"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
+      "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",
+      "GOMA_DUMP_COUNTERZ_FILE": "[TMP_BASE]/goma_counterz",
+      "GOMA_DUMP_STATS_FILE": "[TMP_BASE]/goma_stats",
+      "GOMA_ENABLE_COUNTERZ": "true",
+      "GOMA_HERMETIC": "error",
+      "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+    },
+    "infra_step": true,
+    "name": "preprocess_for_goma (6).start_goma",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LINK@cloudtail@https://console.cloud.google.com/logs/viewer?project=goma-logs&resource=gce_instance%2Finstance_id%2Ffakevm999-m9@@@"
+    ]
+  },
+  {
+    "cmd": [],
+    "name": "preprocess_for_goma (6).goma_with_global_service_account",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "RECIPE_REPO[build]/scripts/tools/runit.py",
+      "--show-path",
+      "--with-third-party-lib",
+      "--",
+      "python",
+      "RECIPE_MODULE[build::goma]/resources/cloudtail_utils.py",
+      "start",
+      "--cloudtail-path",
+      "cloudtail",
+      "--pid-file",
+      "[TMP_BASE]/cloudtail.pid",
+      "--cloudtail-service-account-json",
+      "/creds/service_accounts/service-account-goma-cloudtail.json"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "GOMA_DIR": "[CACHE]/goma/client",
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+    },
+    "infra_step": true,
+    "name": "preprocess_for_goma (6).start cloudtail",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "RECIPE_REPO[depot_tools]/ninja",
+      "-j",
+      "80",
+      "-C",
+      "[CACHE]/builder/engine/src/out/android_debug"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "GOMA_DIR": "[CACHE]/goma/client",
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+    },
+    "name": "build android_debug"
+  },
+  {
+    "cmd": [],
+    "name": "postprocess_for_goma (6)"
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "[CACHE]/goma/client/goma_ctl.py",
+      "jsonstatus",
+      "[TMP_BASE]/goma_jsonstatus.json"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
+      "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",
+      "GOMA_DUMP_COUNTERZ_FILE": "[TMP_BASE]/goma_counterz",
+      "GOMA_DUMP_STATS_FILE": "[TMP_BASE]/goma_stats",
+      "GOMA_ENABLE_COUNTERZ": "true",
+      "GOMA_HERMETIC": "error",
+      "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+    },
+    "name": "postprocess_for_goma (6).goma_jsonstatus",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"notice\": [@@@",
+      "@@@STEP_LOG_LINE@json.output@    {@@@",
+      "@@@STEP_LOG_LINE@json.output@      \"infra_status\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"num_user_error\": 0, @@@",
+      "@@@STEP_LOG_LINE@json.output@        \"ping_status_code\": 200@@@",
+      "@@@STEP_LOG_LINE@json.output@      }@@@",
+      "@@@STEP_LOG_LINE@json.output@    }@@@",
+      "@@@STEP_LOG_LINE@json.output@  ]@@@",
+      "@@@STEP_LOG_LINE@json.output@}@@@",
+      "@@@STEP_LOG_END@json.output@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "[CACHE]/goma/client/goma_ctl.py",
+      "stat"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
+      "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",
+      "GOMA_DUMP_COUNTERZ_FILE": "[TMP_BASE]/goma_counterz",
+      "GOMA_DUMP_STATS_FILE": "[TMP_BASE]/goma_stats",
+      "GOMA_ENABLE_COUNTERZ": "true",
+      "GOMA_HERMETIC": "error",
+      "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+    },
+    "name": "postprocess_for_goma (6).goma_stat",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "[CACHE]/goma/client/goma_ctl.py",
+      "stop"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
+      "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",
+      "GOMA_DUMP_COUNTERZ_FILE": "[TMP_BASE]/goma_counterz",
+      "GOMA_DUMP_STATS_FILE": "[TMP_BASE]/goma_stats",
+      "GOMA_ENABLE_COUNTERZ": "true",
+      "GOMA_HERMETIC": "error",
+      "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+    },
+    "name": "postprocess_for_goma (6).stop_goma",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "vpython",
+      "-u",
+      "RECIPE_REPO[build]/scripts/tools/runit.py",
+      "--show-path",
+      "--",
+      "python",
+      "RECIPE_REPO[build]/recipes/upload_goma_logs.py",
+      "--upload-compiler-proxy-info",
+      "--log-url-json-file",
+      "/path/to/tmp/json",
+      "--gsutil-py-path",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "--bqupload-path",
+      "[CACHE]/goma/bqupload/bqupload",
+      "--bigquery-service-account-json",
+      "/creds/service_accounts/service-account-goma-bigquery.json",
+      "--json-status",
+      "[TMP_BASE]/goma_jsonstatus.json",
+      "--build-exit-status",
+      "0",
+      "--build-step-name",
+      "build android_debug",
+      "--goma-stats-file",
+      "[TMP_BASE]/goma_stats",
+      "--goma-counterz-file",
+      "[TMP_BASE]/goma_counterz",
+      "--goma-crash-report-id-file",
+      "[TMP_BASE]/crash_report_id",
+      "--build-id",
+      "8945511751514863184",
+      "--builder-id-json",
+      "{\"bucket\": \"ci\", \"builder\": \"flutter-engine-linux\", \"project\": \"project\"}",
+      "--is-luci",
+      "--buildbot-buildername",
+      "flutter-engine-linux",
+      "--buildbot-slavename",
+      "fake-bot-id"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "GOMA_DIR": "[CACHE]/goma/client",
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+    },
+    "name": "postprocess_for_goma (6).upload_log",
+    "timeout": 300,
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"compiler_proxy_log\": \"https://chromium-build-stats.appspot.com/compiler_proxy_log/2017/03/30/build11-m1/compiler_proxy.exe.BUILD11-M1.chrome-bot.log.INFO.20170329-222936.4420.gz\"@@@",
+      "@@@STEP_LOG_LINE@json.output@}@@@",
+      "@@@STEP_LOG_END@json.output@@@",
+      "@@@STEP_LINK@compiler_proxy_log@https://chromium-build-stats.appspot.com/compiler_proxy_log/2017/03/30/build11-m1/compiler_proxy.exe.BUILD11-M1.chrome-bot.log.INFO.20170329-222936.4420.gz@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "RECIPE_REPO[build]/scripts/tools/runit.py",
+      "--show-path",
+      "--with-third-party-lib",
+      "--",
+      "python",
+      "RECIPE_MODULE[build::goma]/resources/cloudtail_utils.py",
+      "stop",
+      "--killed-pid-file",
+      "[TMP_BASE]/cloudtail.pid"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "GOMA_DIR": "[CACHE]/goma/client",
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+    },
+    "infra_step": true,
+    "name": "postprocess_for_goma (6).stop cloudtail",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [],
     "name": "preprocess_for_goma (7)"
   },
   {
@@ -2311,7 +2319,8 @@
       "-j",
       "80",
       "-C",
-      "[CACHE]/builder/engine/src/out/android_debug"
+      "[CACHE]/builder/engine/src/out/android_debug",
+      ":dist"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -2320,7 +2329,7 @@
       "GOMA_DIR": "[CACHE]/goma/client",
       "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
-    "name": "build android_debug"
+    "name": "build android_debug :dist"
   },
   {
     "cmd": [],
@@ -2439,7 +2448,7 @@
       "--build-exit-status",
       "0",
       "--build-step-name",
-      "build android_debug",
+      "build android_debug :dist",
       "--goma-stats-file",
       "[TMP_BASE]/goma_stats",
       "--goma-counterz-file",
@@ -2502,6 +2511,30 @@
     ]
   },
   {
+    "cmd": [
+      "[CACHE]/builder/engine/src/flutter/tools/gn",
+      "--android",
+      "--runtime-mode=profile",
+      "--android-cpu=arm"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "GOMA_DIR": "[CACHE]/goma/client",
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "name": "gn --android --runtime-mode=profile --android-cpu=arm"
+  },
+  {
     "cmd": [],
     "name": "preprocess_for_goma (8)"
   },
@@ -2602,8 +2635,7 @@
       "-j",
       "80",
       "-C",
-      "[CACHE]/builder/engine/src/out/android_debug",
-      ":dist"
+      "[CACHE]/builder/engine/src/out/android_profile"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -2612,7 +2644,7 @@
       "GOMA_DIR": "[CACHE]/goma/client",
       "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
-    "name": "build android_debug :dist"
+    "name": "build android_profile"
   },
   {
     "cmd": [],
@@ -2731,7 +2763,7 @@
       "--build-exit-status",
       "0",
       "--build-step-name",
-      "build android_debug :dist",
+      "build android_profile",
       "--goma-stats-file",
       "[TMP_BASE]/goma_stats",
       "--goma-counterz-file",
@@ -2797,7 +2829,7 @@
     "cmd": [
       "[CACHE]/builder/engine/src/flutter/tools/gn",
       "--android",
-      "--runtime-mode=profile",
+      "--runtime-mode=release",
       "--android-cpu=arm"
     ],
     "cwd": "[CACHE]/builder",
@@ -2815,7 +2847,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "gn --android --runtime-mode=profile --android-cpu=arm"
+    "name": "gn --android --runtime-mode=release --android-cpu=arm"
   },
   {
     "cmd": [],
@@ -2918,7 +2950,7 @@
       "-j",
       "80",
       "-C",
-      "[CACHE]/builder/engine/src/out/android_profile"
+      "[CACHE]/builder/engine/src/out/android_release"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -2927,7 +2959,7 @@
       "GOMA_DIR": "[CACHE]/goma/client",
       "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
-    "name": "build android_profile"
+    "name": "build android_release"
   },
   {
     "cmd": [],
@@ -3046,7 +3078,7 @@
       "--build-exit-status",
       "0",
       "--build-step-name",
-      "build android_profile",
+      "build android_release",
       "--goma-stats-file",
       "[TMP_BASE]/goma_stats",
       "--goma-counterz-file",
@@ -3112,8 +3144,8 @@
     "cmd": [
       "[CACHE]/builder/engine/src/flutter/tools/gn",
       "--android",
-      "--runtime-mode=release",
-      "--android-cpu=arm"
+      "--runtime-mode=profile",
+      "--android-cpu=arm64"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -3130,7 +3162,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "gn --android --runtime-mode=release --android-cpu=arm"
+    "name": "gn --android --runtime-mode=profile --android-cpu=arm64"
   },
   {
     "cmd": [],
@@ -3233,7 +3265,7 @@
       "-j",
       "80",
       "-C",
-      "[CACHE]/builder/engine/src/out/android_release"
+      "[CACHE]/builder/engine/src/out/android_profile_arm64"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -3242,7 +3274,7 @@
       "GOMA_DIR": "[CACHE]/goma/client",
       "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
-    "name": "build android_release"
+    "name": "build android_profile_arm64"
   },
   {
     "cmd": [],
@@ -3361,7 +3393,7 @@
       "--build-exit-status",
       "0",
       "--build-step-name",
-      "build android_release",
+      "build android_profile_arm64",
       "--goma-stats-file",
       "[TMP_BASE]/goma_stats",
       "--goma-counterz-file",
@@ -3427,7 +3459,7 @@
     "cmd": [
       "[CACHE]/builder/engine/src/flutter/tools/gn",
       "--android",
-      "--runtime-mode=profile",
+      "--runtime-mode=release",
       "--android-cpu=arm64"
     ],
     "cwd": "[CACHE]/builder",
@@ -3445,7 +3477,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "gn --android --runtime-mode=profile --android-cpu=arm64"
+    "name": "gn --android --runtime-mode=release --android-cpu=arm64"
   },
   {
     "cmd": [],
@@ -3548,7 +3580,7 @@
       "-j",
       "80",
       "-C",
-      "[CACHE]/builder/engine/src/out/android_profile_arm64"
+      "[CACHE]/builder/engine/src/out/android_release_arm64"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -3557,7 +3589,7 @@
       "GOMA_DIR": "[CACHE]/goma/client",
       "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
-    "name": "build android_profile_arm64"
+    "name": "build android_release_arm64"
   },
   {
     "cmd": [],
@@ -3676,7 +3708,7 @@
       "--build-exit-status",
       "0",
       "--build-step-name",
-      "build android_profile_arm64",
+      "build android_release_arm64",
       "--goma-stats-file",
       "[TMP_BASE]/goma_stats",
       "--goma-counterz-file",
@@ -3742,8 +3774,8 @@
     "cmd": [
       "[CACHE]/builder/engine/src/flutter/tools/gn",
       "--android",
-      "--runtime-mode=release",
-      "--android-cpu=arm64"
+      "--runtime-mode=profile",
+      "--android-cpu=x64"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -3760,7 +3792,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "gn --android --runtime-mode=release --android-cpu=arm64"
+    "name": "gn --android --runtime-mode=profile --android-cpu=x64"
   },
   {
     "cmd": [],
@@ -3863,7 +3895,7 @@
       "-j",
       "80",
       "-C",
-      "[CACHE]/builder/engine/src/out/android_release_arm64"
+      "[CACHE]/builder/engine/src/out/android_profile_x64"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -3872,7 +3904,7 @@
       "GOMA_DIR": "[CACHE]/goma/client",
       "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
-    "name": "build android_release_arm64"
+    "name": "build android_profile_x64"
   },
   {
     "cmd": [],
@@ -3991,7 +4023,7 @@
       "--build-exit-status",
       "0",
       "--build-step-name",
-      "build android_release_arm64",
+      "build android_profile_x64",
       "--goma-stats-file",
       "[TMP_BASE]/goma_stats",
       "--goma-counterz-file",
@@ -4057,7 +4089,7 @@
     "cmd": [
       "[CACHE]/builder/engine/src/flutter/tools/gn",
       "--android",
-      "--runtime-mode=profile",
+      "--runtime-mode=release",
       "--android-cpu=x64"
     ],
     "cwd": "[CACHE]/builder",
@@ -4075,7 +4107,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "gn --android --runtime-mode=profile --android-cpu=x64"
+    "name": "gn --android --runtime-mode=release --android-cpu=x64"
   },
   {
     "cmd": [],
@@ -4178,7 +4210,7 @@
       "-j",
       "80",
       "-C",
-      "[CACHE]/builder/engine/src/out/android_profile_x64"
+      "[CACHE]/builder/engine/src/out/android_release_x64"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -4187,7 +4219,7 @@
       "GOMA_DIR": "[CACHE]/goma/client",
       "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
-    "name": "build android_profile_x64"
+    "name": "build android_release_x64"
   },
   {
     "cmd": [],
@@ -4306,7 +4338,7 @@
       "--build-exit-status",
       "0",
       "--build-step-name",
-      "build android_profile_x64",
+      "build android_release_x64",
       "--goma-stats-file",
       "[TMP_BASE]/goma_stats",
       "--goma-counterz-file",
@@ -4372,8 +4404,8 @@
     "cmd": [
       "[CACHE]/builder/engine/src/flutter/tools/gn",
       "--android",
-      "--runtime-mode=release",
-      "--android-cpu=x64"
+      "--android-cpu=x64",
+      "--no-lto"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -4390,7 +4422,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "gn --android --runtime-mode=release --android-cpu=x64"
+    "name": "gn --android --android-cpu=x64 --no-lto"
   },
   {
     "cmd": [],
@@ -4493,7 +4525,7 @@
       "-j",
       "80",
       "-C",
-      "[CACHE]/builder/engine/src/out/android_release_x64"
+      "[CACHE]/builder/engine/src/out/android_debug_x64"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -4502,7 +4534,7 @@
       "GOMA_DIR": "[CACHE]/goma/client",
       "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
-    "name": "build android_release_x64"
+    "name": "build android_debug_x64"
   },
   {
     "cmd": [],
@@ -4621,7 +4653,7 @@
       "--build-exit-status",
       "0",
       "--build-step-name",
-      "build android_release_x64",
+      "build android_debug_x64",
       "--goma-stats-file",
       "[TMP_BASE]/goma_stats",
       "--goma-counterz-file",
@@ -4687,7 +4719,7 @@
     "cmd": [
       "[CACHE]/builder/engine/src/flutter/tools/gn",
       "--android",
-      "--android-cpu=x64",
+      "--android-cpu=x86",
       "--no-lto"
     ],
     "cwd": "[CACHE]/builder",
@@ -4705,7 +4737,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "gn --android --android-cpu=x64 --no-lto"
+    "name": "gn --android --android-cpu=x86 --no-lto"
   },
   {
     "cmd": [],
@@ -4808,7 +4840,7 @@
       "-j",
       "80",
       "-C",
-      "[CACHE]/builder/engine/src/out/android_debug_x64"
+      "[CACHE]/builder/engine/src/out/android_debug_x86"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -4817,7 +4849,7 @@
       "GOMA_DIR": "[CACHE]/goma/client",
       "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
-    "name": "build android_debug_x64"
+    "name": "build android_debug_x86"
   },
   {
     "cmd": [],
@@ -4936,7 +4968,7 @@
       "--build-exit-status",
       "0",
       "--build-step-name",
-      "build android_debug_x64",
+      "build android_debug_x86",
       "--goma-stats-file",
       "[TMP_BASE]/goma_stats",
       "--goma-counterz-file",
@@ -5000,321 +5032,6 @@
   },
   {
     "cmd": [
-      "[CACHE]/builder/engine/src/flutter/tools/gn",
-      "--android",
-      "--android-cpu=x86",
-      "--no-lto"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
-      "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "name": "gn --android --android-cpu=x86 --no-lto"
-  },
-  {
-    "cmd": [],
-    "name": "preprocess_for_goma (16)"
-  },
-  {
-    "cmd": [
-      "vpython",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0777",
-      "[CACHE]/goma/data/flutter_engine_linux"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
-      "GOMA_DIR": "[CACHE]/goma/client",
-      "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",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "[CACHE]/goma/client/goma_ctl.py",
-      "restart"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "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",
-      "GOMA_DUMP_COUNTERZ_FILE": "[TMP_BASE]/goma_counterz",
-      "GOMA_DUMP_STATS_FILE": "[TMP_BASE]/goma_stats",
-      "GOMA_ENABLE_COUNTERZ": "true",
-      "GOMA_HERMETIC": "error",
-      "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
-    },
-    "infra_step": true,
-    "name": "preprocess_for_goma (16).start_goma",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LINK@cloudtail@https://console.cloud.google.com/logs/viewer?project=goma-logs&resource=gce_instance%2Finstance_id%2Ffakevm999-m9@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "preprocess_for_goma (16).goma_with_global_service_account",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "RECIPE_REPO[build]/scripts/tools/runit.py",
-      "--show-path",
-      "--with-third-party-lib",
-      "--",
-      "python",
-      "RECIPE_MODULE[build::goma]/resources/cloudtail_utils.py",
-      "start",
-      "--cloudtail-path",
-      "cloudtail",
-      "--pid-file",
-      "[TMP_BASE]/cloudtail.pid",
-      "--cloudtail-service-account-json",
-      "/creds/service_accounts/service-account-goma-cloudtail.json"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
-      "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
-    },
-    "infra_step": true,
-    "name": "preprocess_for_goma (16).start cloudtail",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
-      "-j",
-      "80",
-      "-C",
-      "[CACHE]/builder/engine/src/out/android_debug_x86"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
-      "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
-    },
-    "name": "build android_debug_x86"
-  },
-  {
-    "cmd": [],
-    "name": "postprocess_for_goma (16)"
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "[CACHE]/goma/client/goma_ctl.py",
-      "jsonstatus",
-      "[TMP_BASE]/goma_jsonstatus.json"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "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",
-      "GOMA_DUMP_COUNTERZ_FILE": "[TMP_BASE]/goma_counterz",
-      "GOMA_DUMP_STATS_FILE": "[TMP_BASE]/goma_stats",
-      "GOMA_ENABLE_COUNTERZ": "true",
-      "GOMA_HERMETIC": "error",
-      "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
-    },
-    "name": "postprocess_for_goma (16).goma_jsonstatus",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"notice\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@    {@@@",
-      "@@@STEP_LOG_LINE@json.output@      \"infra_status\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"num_user_error\": 0, @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"ping_status_code\": 200@@@",
-      "@@@STEP_LOG_LINE@json.output@      }@@@",
-      "@@@STEP_LOG_LINE@json.output@    }@@@",
-      "@@@STEP_LOG_LINE@json.output@  ]@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "[CACHE]/goma/client/goma_ctl.py",
-      "stat"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "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",
-      "GOMA_DUMP_COUNTERZ_FILE": "[TMP_BASE]/goma_counterz",
-      "GOMA_DUMP_STATS_FILE": "[TMP_BASE]/goma_stats",
-      "GOMA_ENABLE_COUNTERZ": "true",
-      "GOMA_HERMETIC": "error",
-      "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
-    },
-    "name": "postprocess_for_goma (16).goma_stat",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "[CACHE]/goma/client/goma_ctl.py",
-      "stop"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "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",
-      "GOMA_DUMP_COUNTERZ_FILE": "[TMP_BASE]/goma_counterz",
-      "GOMA_DUMP_STATS_FILE": "[TMP_BASE]/goma_stats",
-      "GOMA_ENABLE_COUNTERZ": "true",
-      "GOMA_HERMETIC": "error",
-      "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
-    },
-    "name": "postprocess_for_goma (16).stop_goma",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython",
-      "-u",
-      "RECIPE_REPO[build]/scripts/tools/runit.py",
-      "--show-path",
-      "--",
-      "python",
-      "RECIPE_REPO[build]/recipes/upload_goma_logs.py",
-      "--upload-compiler-proxy-info",
-      "--log-url-json-file",
-      "/path/to/tmp/json",
-      "--gsutil-py-path",
-      "RECIPE_REPO[depot_tools]/gsutil.py",
-      "--bqupload-path",
-      "[CACHE]/goma/bqupload/bqupload",
-      "--bigquery-service-account-json",
-      "/creds/service_accounts/service-account-goma-bigquery.json",
-      "--json-status",
-      "[TMP_BASE]/goma_jsonstatus.json",
-      "--build-exit-status",
-      "0",
-      "--build-step-name",
-      "build android_debug_x86",
-      "--goma-stats-file",
-      "[TMP_BASE]/goma_stats",
-      "--goma-counterz-file",
-      "[TMP_BASE]/goma_counterz",
-      "--goma-crash-report-id-file",
-      "[TMP_BASE]/crash_report_id",
-      "--build-id",
-      "8945511751514863184",
-      "--builder-id-json",
-      "{\"bucket\": \"ci\", \"builder\": \"flutter-engine-linux\", \"project\": \"project\"}",
-      "--is-luci",
-      "--buildbot-buildername",
-      "flutter-engine-linux",
-      "--buildbot-slavename",
-      "fake-bot-id"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
-      "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
-    },
-    "name": "postprocess_for_goma (16).upload_log",
-    "timeout": 300,
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"compiler_proxy_log\": \"https://chromium-build-stats.appspot.com/compiler_proxy_log/2017/03/30/build11-m1/compiler_proxy.exe.BUILD11-M1.chrome-bot.log.INFO.20170329-222936.4420.gz\"@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@",
-      "@@@STEP_LINK@compiler_proxy_log@https://chromium-build-stats.appspot.com/compiler_proxy_log/2017/03/30/build11-m1/compiler_proxy.exe.BUILD11-M1.chrome-bot.log.INFO.20170329-222936.4420.gz@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "RECIPE_REPO[build]/scripts/tools/runit.py",
-      "--show-path",
-      "--with-third-party-lib",
-      "--",
-      "python",
-      "RECIPE_MODULE[build::goma]/resources/cloudtail_utils.py",
-      "stop",
-      "--killed-pid-file",
-      "[TMP_BASE]/cloudtail.pid"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
-      "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
-    },
-    "infra_step": true,
-    "name": "postprocess_for_goma (16).stop cloudtail",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
       "[CACHE]/builder/flutter/bin/flutter",
       "config",
       "--no-analytics"
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 7de3069..8165440 100644
--- a/recipes/dart/flutter_engine.expected/run-undefined-test-suite.json
+++ b/recipes/dart/flutter_engine.expected/run-undefined-test-suite.json
@@ -1177,6 +1177,27 @@
     ]
   },
   {
+    "cmd": [
+      "[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/engine/src/third_party/android_tools/sdk",
+      "GOMA_DIR": "[CACHE]/goma/client"
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "name": "gn --runtime-mode=release"
+  },
+  {
     "cmd": [],
     "name": "preprocess_for_goma (4)"
   },
@@ -1274,8 +1295,7 @@
       "-j",
       "80",
       "-C",
-      "[CACHE]/builder/engine/src/out/host_debug_unopt",
-      "generate_dart_ui"
+      "[CACHE]/builder/engine/src/out/host_release"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1283,7 +1303,7 @@
       "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"
+    "name": "build host_release"
   },
   {
     "cmd": [],
@@ -1399,7 +1419,7 @@
       "--build-exit-status",
       "0",
       "--build-step-name",
-      "build host_debug_unopt generate_dart_ui",
+      "build host_release",
       "--goma-stats-file",
       "[TMP_BASE]/goma_stats",
       "--goma-counterz-file",
@@ -1462,7 +1482,11 @@
   {
     "cmd": [
       "[CACHE]/builder/engine/src/flutter/tools/gn",
-      "--runtime-mode=release"
+      "--fuchsia",
+      "--fuchsia-cpu",
+      "x64",
+      "--runtime-mode=debug",
+      "--no-lto"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1478,7 +1502,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "gn --runtime-mode=release"
+    "name": "gn --fuchsia --fuchsia-cpu x64 --runtime-mode=debug --no-lto"
   },
   {
     "cmd": [],
@@ -1578,7 +1602,9 @@
       "-j",
       "80",
       "-C",
-      "[CACHE]/builder/engine/src/out/host_release"
+      "[CACHE]/builder/engine/src/out/fuchsia_debug_x64",
+      "flutter/shell/platform/fuchsia:fuchsia",
+      "fuchsia_tests"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1586,7 +1612,7 @@
       "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
       "GOMA_DIR": "[CACHE]/goma/client"
     },
-    "name": "build host_release"
+    "name": "build fuchsia_debug_x64 flutter/shell/platform/fuchsia:fuchsia fuchsia_tests"
   },
   {
     "cmd": [],
@@ -1702,7 +1728,7 @@
       "--build-exit-status",
       "0",
       "--build-step-name",
-      "build host_release",
+      "build fuchsia_debug_x64 flutter/shell/platform/fuchsia:fuchsia fuchsia_tests",
       "--goma-stats-file",
       "[TMP_BASE]/goma_stats",
       "--goma-counterz-file",
@@ -1764,315 +1790,6 @@
   },
   {
     "cmd": [
-      "[CACHE]/builder/engine/src/flutter/tools/gn",
-      "--fuchsia",
-      "--fuchsia-cpu",
-      "x64",
-      "--runtime-mode=debug",
-      "--no-lto"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
-      "GOMA_DIR": "[CACHE]/goma/client"
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "name": "gn --fuchsia --fuchsia-cpu x64 --runtime-mode=debug --no-lto"
-  },
-  {
-    "cmd": [],
-    "name": "preprocess_for_goma (6)"
-  },
-  {
-    "cmd": [
-      "vpython",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0777",
-      "[CACHE]/goma/data/flutter_engine_linux"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
-      "GOMA_DIR": "[CACHE]/goma/client"
-    },
-    "infra_step": true,
-    "name": "preprocess_for_goma (6).goma cache directory",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "[CACHE]/goma/client/goma_ctl.py",
-      "restart"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "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",
-      "GOMA_DUMP_COUNTERZ_FILE": "[TMP_BASE]/goma_counterz",
-      "GOMA_DUMP_STATS_FILE": "[TMP_BASE]/goma_stats",
-      "GOMA_ENABLE_COUNTERZ": "true",
-      "GOMA_HERMETIC": "error",
-      "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
-    },
-    "infra_step": true,
-    "name": "preprocess_for_goma (6).start_goma",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LINK@cloudtail@https://console.cloud.google.com/logs/viewer?project=goma-logs&resource=gce_instance%2Finstance_id%2Ffakevm999-m9@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "preprocess_for_goma (6).goma_with_global_service_account",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "RECIPE_REPO[build]/scripts/tools/runit.py",
-      "--show-path",
-      "--with-third-party-lib",
-      "--",
-      "python",
-      "RECIPE_MODULE[build::goma]/resources/cloudtail_utils.py",
-      "start",
-      "--cloudtail-path",
-      "cloudtail",
-      "--pid-file",
-      "[TMP_BASE]/cloudtail.pid",
-      "--cloudtail-service-account-json",
-      "/creds/service_accounts/service-account-goma-cloudtail.json"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
-      "GOMA_DIR": "[CACHE]/goma/client"
-    },
-    "infra_step": true,
-    "name": "preprocess_for_goma (6).start cloudtail",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
-      "-j",
-      "80",
-      "-C",
-      "[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/engine/src/third_party/android_tools/sdk",
-      "GOMA_DIR": "[CACHE]/goma/client"
-    },
-    "name": "build fuchsia_debug_x64 flutter/shell/platform/fuchsia:fuchsia fuchsia_tests"
-  },
-  {
-    "cmd": [],
-    "name": "postprocess_for_goma (6)"
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "[CACHE]/goma/client/goma_ctl.py",
-      "jsonstatus",
-      "[TMP_BASE]/goma_jsonstatus.json"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "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",
-      "GOMA_DUMP_COUNTERZ_FILE": "[TMP_BASE]/goma_counterz",
-      "GOMA_DUMP_STATS_FILE": "[TMP_BASE]/goma_stats",
-      "GOMA_ENABLE_COUNTERZ": "true",
-      "GOMA_HERMETIC": "error",
-      "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
-    },
-    "name": "postprocess_for_goma (6).goma_jsonstatus",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"notice\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@    {@@@",
-      "@@@STEP_LOG_LINE@json.output@      \"infra_status\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"num_user_error\": 0, @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"ping_status_code\": 200@@@",
-      "@@@STEP_LOG_LINE@json.output@      }@@@",
-      "@@@STEP_LOG_LINE@json.output@    }@@@",
-      "@@@STEP_LOG_LINE@json.output@  ]@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "[CACHE]/goma/client/goma_ctl.py",
-      "stat"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "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",
-      "GOMA_DUMP_COUNTERZ_FILE": "[TMP_BASE]/goma_counterz",
-      "GOMA_DUMP_STATS_FILE": "[TMP_BASE]/goma_stats",
-      "GOMA_ENABLE_COUNTERZ": "true",
-      "GOMA_HERMETIC": "error",
-      "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
-    },
-    "name": "postprocess_for_goma (6).goma_stat",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "[CACHE]/goma/client/goma_ctl.py",
-      "stop"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "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",
-      "GOMA_DUMP_COUNTERZ_FILE": "[TMP_BASE]/goma_counterz",
-      "GOMA_DUMP_STATS_FILE": "[TMP_BASE]/goma_stats",
-      "GOMA_ENABLE_COUNTERZ": "true",
-      "GOMA_HERMETIC": "error",
-      "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
-    },
-    "name": "postprocess_for_goma (6).stop_goma",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython",
-      "-u",
-      "RECIPE_REPO[build]/scripts/tools/runit.py",
-      "--show-path",
-      "--",
-      "python",
-      "RECIPE_REPO[build]/recipes/upload_goma_logs.py",
-      "--upload-compiler-proxy-info",
-      "--log-url-json-file",
-      "/path/to/tmp/json",
-      "--gsutil-py-path",
-      "RECIPE_REPO[depot_tools]/gsutil.py",
-      "--bqupload-path",
-      "[CACHE]/goma/bqupload/bqupload",
-      "--bigquery-service-account-json",
-      "/creds/service_accounts/service-account-goma-bigquery.json",
-      "--json-status",
-      "[TMP_BASE]/goma_jsonstatus.json",
-      "--build-exit-status",
-      "0",
-      "--build-step-name",
-      "build fuchsia_debug_x64 flutter/shell/platform/fuchsia:fuchsia fuchsia_tests",
-      "--goma-stats-file",
-      "[TMP_BASE]/goma_stats",
-      "--goma-counterz-file",
-      "[TMP_BASE]/goma_counterz",
-      "--goma-crash-report-id-file",
-      "[TMP_BASE]/crash_report_id",
-      "--build-id",
-      "8945511751514863184",
-      "--builder-id-json",
-      "{\"bucket\": \"ci\", \"builder\": \"flutter-engine-linux\", \"project\": \"project\"}",
-      "--is-luci",
-      "--buildbot-buildername",
-      "flutter-engine-linux",
-      "--buildbot-slavename",
-      "fake-bot-id"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
-      "GOMA_DIR": "[CACHE]/goma/client"
-    },
-    "name": "postprocess_for_goma (6).upload_log",
-    "timeout": 300,
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"compiler_proxy_log\": \"https://chromium-build-stats.appspot.com/compiler_proxy_log/2017/03/30/build11-m1/compiler_proxy.exe.BUILD11-M1.chrome-bot.log.INFO.20170329-222936.4420.gz\"@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@",
-      "@@@STEP_LINK@compiler_proxy_log@https://chromium-build-stats.appspot.com/compiler_proxy_log/2017/03/30/build11-m1/compiler_proxy.exe.BUILD11-M1.chrome-bot.log.INFO.20170329-222936.4420.gz@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "RECIPE_REPO[build]/scripts/tools/runit.py",
-      "--show-path",
-      "--with-third-party-lib",
-      "--",
-      "python",
-      "RECIPE_MODULE[build::goma]/resources/cloudtail_utils.py",
-      "stop",
-      "--killed-pid-file",
-      "[TMP_BASE]/cloudtail.pid"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
-      "GOMA_DIR": "[CACHE]/goma/client"
-    },
-    "infra_step": true,
-    "name": "postprocess_for_goma (6).stop cloudtail",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
       "vpython",
       "-u",
       "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
@@ -2212,6 +1929,297 @@
   },
   {
     "cmd": [],
+    "name": "preprocess_for_goma (6)"
+  },
+  {
+    "cmd": [
+      "vpython",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "ensure-directory",
+      "--mode",
+      "0777",
+      "[CACHE]/goma/data/flutter_engine_linux"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "GOMA_DIR": "[CACHE]/goma/client",
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+    },
+    "infra_step": true,
+    "name": "preprocess_for_goma (6).goma cache directory",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "[CACHE]/goma/client/goma_ctl.py",
+      "restart"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
+      "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",
+      "GOMA_DUMP_COUNTERZ_FILE": "[TMP_BASE]/goma_counterz",
+      "GOMA_DUMP_STATS_FILE": "[TMP_BASE]/goma_stats",
+      "GOMA_ENABLE_COUNTERZ": "true",
+      "GOMA_HERMETIC": "error",
+      "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+    },
+    "infra_step": true,
+    "name": "preprocess_for_goma (6).start_goma",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LINK@cloudtail@https://console.cloud.google.com/logs/viewer?project=goma-logs&resource=gce_instance%2Finstance_id%2Ffakevm999-m9@@@"
+    ]
+  },
+  {
+    "cmd": [],
+    "name": "preprocess_for_goma (6).goma_with_global_service_account",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "RECIPE_REPO[build]/scripts/tools/runit.py",
+      "--show-path",
+      "--with-third-party-lib",
+      "--",
+      "python",
+      "RECIPE_MODULE[build::goma]/resources/cloudtail_utils.py",
+      "start",
+      "--cloudtail-path",
+      "cloudtail",
+      "--pid-file",
+      "[TMP_BASE]/cloudtail.pid",
+      "--cloudtail-service-account-json",
+      "/creds/service_accounts/service-account-goma-cloudtail.json"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "GOMA_DIR": "[CACHE]/goma/client",
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+    },
+    "infra_step": true,
+    "name": "preprocess_for_goma (6).start cloudtail",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "RECIPE_REPO[depot_tools]/ninja",
+      "-j",
+      "80",
+      "-C",
+      "[CACHE]/builder/engine/src/out/android_debug"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "GOMA_DIR": "[CACHE]/goma/client",
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+    },
+    "name": "build android_debug"
+  },
+  {
+    "cmd": [],
+    "name": "postprocess_for_goma (6)"
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "[CACHE]/goma/client/goma_ctl.py",
+      "jsonstatus",
+      "[TMP_BASE]/goma_jsonstatus.json"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
+      "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",
+      "GOMA_DUMP_COUNTERZ_FILE": "[TMP_BASE]/goma_counterz",
+      "GOMA_DUMP_STATS_FILE": "[TMP_BASE]/goma_stats",
+      "GOMA_ENABLE_COUNTERZ": "true",
+      "GOMA_HERMETIC": "error",
+      "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+    },
+    "name": "postprocess_for_goma (6).goma_jsonstatus",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"notice\": [@@@",
+      "@@@STEP_LOG_LINE@json.output@    {@@@",
+      "@@@STEP_LOG_LINE@json.output@      \"infra_status\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"num_user_error\": 0, @@@",
+      "@@@STEP_LOG_LINE@json.output@        \"ping_status_code\": 200@@@",
+      "@@@STEP_LOG_LINE@json.output@      }@@@",
+      "@@@STEP_LOG_LINE@json.output@    }@@@",
+      "@@@STEP_LOG_LINE@json.output@  ]@@@",
+      "@@@STEP_LOG_LINE@json.output@}@@@",
+      "@@@STEP_LOG_END@json.output@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "[CACHE]/goma/client/goma_ctl.py",
+      "stat"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
+      "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",
+      "GOMA_DUMP_COUNTERZ_FILE": "[TMP_BASE]/goma_counterz",
+      "GOMA_DUMP_STATS_FILE": "[TMP_BASE]/goma_stats",
+      "GOMA_ENABLE_COUNTERZ": "true",
+      "GOMA_HERMETIC": "error",
+      "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+    },
+    "name": "postprocess_for_goma (6).goma_stat",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "[CACHE]/goma/client/goma_ctl.py",
+      "stop"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
+      "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",
+      "GOMA_DUMP_COUNTERZ_FILE": "[TMP_BASE]/goma_counterz",
+      "GOMA_DUMP_STATS_FILE": "[TMP_BASE]/goma_stats",
+      "GOMA_ENABLE_COUNTERZ": "true",
+      "GOMA_HERMETIC": "error",
+      "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+    },
+    "name": "postprocess_for_goma (6).stop_goma",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "vpython",
+      "-u",
+      "RECIPE_REPO[build]/scripts/tools/runit.py",
+      "--show-path",
+      "--",
+      "python",
+      "RECIPE_REPO[build]/recipes/upload_goma_logs.py",
+      "--upload-compiler-proxy-info",
+      "--log-url-json-file",
+      "/path/to/tmp/json",
+      "--gsutil-py-path",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "--bqupload-path",
+      "[CACHE]/goma/bqupload/bqupload",
+      "--bigquery-service-account-json",
+      "/creds/service_accounts/service-account-goma-bigquery.json",
+      "--json-status",
+      "[TMP_BASE]/goma_jsonstatus.json",
+      "--build-exit-status",
+      "0",
+      "--build-step-name",
+      "build android_debug",
+      "--goma-stats-file",
+      "[TMP_BASE]/goma_stats",
+      "--goma-counterz-file",
+      "[TMP_BASE]/goma_counterz",
+      "--goma-crash-report-id-file",
+      "[TMP_BASE]/crash_report_id",
+      "--build-id",
+      "8945511751514863184",
+      "--builder-id-json",
+      "{\"bucket\": \"ci\", \"builder\": \"flutter-engine-linux\", \"project\": \"project\"}",
+      "--is-luci",
+      "--buildbot-buildername",
+      "flutter-engine-linux",
+      "--buildbot-slavename",
+      "fake-bot-id"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "GOMA_DIR": "[CACHE]/goma/client",
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+    },
+    "name": "postprocess_for_goma (6).upload_log",
+    "timeout": 300,
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"compiler_proxy_log\": \"https://chromium-build-stats.appspot.com/compiler_proxy_log/2017/03/30/build11-m1/compiler_proxy.exe.BUILD11-M1.chrome-bot.log.INFO.20170329-222936.4420.gz\"@@@",
+      "@@@STEP_LOG_LINE@json.output@}@@@",
+      "@@@STEP_LOG_END@json.output@@@",
+      "@@@STEP_LINK@compiler_proxy_log@https://chromium-build-stats.appspot.com/compiler_proxy_log/2017/03/30/build11-m1/compiler_proxy.exe.BUILD11-M1.chrome-bot.log.INFO.20170329-222936.4420.gz@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "RECIPE_REPO[build]/scripts/tools/runit.py",
+      "--show-path",
+      "--with-third-party-lib",
+      "--",
+      "python",
+      "RECIPE_MODULE[build::goma]/resources/cloudtail_utils.py",
+      "stop",
+      "--killed-pid-file",
+      "[TMP_BASE]/cloudtail.pid"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "GOMA_DIR": "[CACHE]/goma/client",
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+    },
+    "infra_step": true,
+    "name": "postprocess_for_goma (6).stop cloudtail",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [],
     "name": "preprocess_for_goma (7)"
   },
   {
@@ -2311,7 +2319,8 @@
       "-j",
       "80",
       "-C",
-      "[CACHE]/builder/engine/src/out/android_debug"
+      "[CACHE]/builder/engine/src/out/android_debug",
+      ":dist"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -2320,7 +2329,7 @@
       "GOMA_DIR": "[CACHE]/goma/client",
       "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
-    "name": "build android_debug"
+    "name": "build android_debug :dist"
   },
   {
     "cmd": [],
@@ -2439,7 +2448,7 @@
       "--build-exit-status",
       "0",
       "--build-step-name",
-      "build android_debug",
+      "build android_debug :dist",
       "--goma-stats-file",
       "[TMP_BASE]/goma_stats",
       "--goma-counterz-file",
@@ -2502,6 +2511,30 @@
     ]
   },
   {
+    "cmd": [
+      "[CACHE]/builder/engine/src/flutter/tools/gn",
+      "--android",
+      "--runtime-mode=profile",
+      "--android-cpu=arm"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
+      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
+      "GOMA_DIR": "[CACHE]/goma/client",
+      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "name": "gn --android --runtime-mode=profile --android-cpu=arm"
+  },
+  {
     "cmd": [],
     "name": "preprocess_for_goma (8)"
   },
@@ -2602,8 +2635,7 @@
       "-j",
       "80",
       "-C",
-      "[CACHE]/builder/engine/src/out/android_debug",
-      ":dist"
+      "[CACHE]/builder/engine/src/out/android_profile"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -2612,7 +2644,7 @@
       "GOMA_DIR": "[CACHE]/goma/client",
       "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
-    "name": "build android_debug :dist"
+    "name": "build android_profile"
   },
   {
     "cmd": [],
@@ -2731,7 +2763,7 @@
       "--build-exit-status",
       "0",
       "--build-step-name",
-      "build android_debug :dist",
+      "build android_profile",
       "--goma-stats-file",
       "[TMP_BASE]/goma_stats",
       "--goma-counterz-file",
@@ -2797,7 +2829,7 @@
     "cmd": [
       "[CACHE]/builder/engine/src/flutter/tools/gn",
       "--android",
-      "--runtime-mode=profile",
+      "--runtime-mode=release",
       "--android-cpu=arm"
     ],
     "cwd": "[CACHE]/builder",
@@ -2815,7 +2847,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "gn --android --runtime-mode=profile --android-cpu=arm"
+    "name": "gn --android --runtime-mode=release --android-cpu=arm"
   },
   {
     "cmd": [],
@@ -2918,7 +2950,7 @@
       "-j",
       "80",
       "-C",
-      "[CACHE]/builder/engine/src/out/android_profile"
+      "[CACHE]/builder/engine/src/out/android_release"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -2927,7 +2959,7 @@
       "GOMA_DIR": "[CACHE]/goma/client",
       "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
-    "name": "build android_profile"
+    "name": "build android_release"
   },
   {
     "cmd": [],
@@ -3046,7 +3078,7 @@
       "--build-exit-status",
       "0",
       "--build-step-name",
-      "build android_profile",
+      "build android_release",
       "--goma-stats-file",
       "[TMP_BASE]/goma_stats",
       "--goma-counterz-file",
@@ -3112,8 +3144,8 @@
     "cmd": [
       "[CACHE]/builder/engine/src/flutter/tools/gn",
       "--android",
-      "--runtime-mode=release",
-      "--android-cpu=arm"
+      "--runtime-mode=profile",
+      "--android-cpu=arm64"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -3130,7 +3162,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "gn --android --runtime-mode=release --android-cpu=arm"
+    "name": "gn --android --runtime-mode=profile --android-cpu=arm64"
   },
   {
     "cmd": [],
@@ -3233,7 +3265,7 @@
       "-j",
       "80",
       "-C",
-      "[CACHE]/builder/engine/src/out/android_release"
+      "[CACHE]/builder/engine/src/out/android_profile_arm64"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -3242,7 +3274,7 @@
       "GOMA_DIR": "[CACHE]/goma/client",
       "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
-    "name": "build android_release"
+    "name": "build android_profile_arm64"
   },
   {
     "cmd": [],
@@ -3361,7 +3393,7 @@
       "--build-exit-status",
       "0",
       "--build-step-name",
-      "build android_release",
+      "build android_profile_arm64",
       "--goma-stats-file",
       "[TMP_BASE]/goma_stats",
       "--goma-counterz-file",
@@ -3427,7 +3459,7 @@
     "cmd": [
       "[CACHE]/builder/engine/src/flutter/tools/gn",
       "--android",
-      "--runtime-mode=profile",
+      "--runtime-mode=release",
       "--android-cpu=arm64"
     ],
     "cwd": "[CACHE]/builder",
@@ -3445,7 +3477,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "gn --android --runtime-mode=profile --android-cpu=arm64"
+    "name": "gn --android --runtime-mode=release --android-cpu=arm64"
   },
   {
     "cmd": [],
@@ -3548,7 +3580,7 @@
       "-j",
       "80",
       "-C",
-      "[CACHE]/builder/engine/src/out/android_profile_arm64"
+      "[CACHE]/builder/engine/src/out/android_release_arm64"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -3557,7 +3589,7 @@
       "GOMA_DIR": "[CACHE]/goma/client",
       "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
-    "name": "build android_profile_arm64"
+    "name": "build android_release_arm64"
   },
   {
     "cmd": [],
@@ -3676,7 +3708,7 @@
       "--build-exit-status",
       "0",
       "--build-step-name",
-      "build android_profile_arm64",
+      "build android_release_arm64",
       "--goma-stats-file",
       "[TMP_BASE]/goma_stats",
       "--goma-counterz-file",
@@ -3742,8 +3774,8 @@
     "cmd": [
       "[CACHE]/builder/engine/src/flutter/tools/gn",
       "--android",
-      "--runtime-mode=release",
-      "--android-cpu=arm64"
+      "--runtime-mode=profile",
+      "--android-cpu=x64"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -3760,7 +3792,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "gn --android --runtime-mode=release --android-cpu=arm64"
+    "name": "gn --android --runtime-mode=profile --android-cpu=x64"
   },
   {
     "cmd": [],
@@ -3863,7 +3895,7 @@
       "-j",
       "80",
       "-C",
-      "[CACHE]/builder/engine/src/out/android_release_arm64"
+      "[CACHE]/builder/engine/src/out/android_profile_x64"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -3872,7 +3904,7 @@
       "GOMA_DIR": "[CACHE]/goma/client",
       "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
-    "name": "build android_release_arm64"
+    "name": "build android_profile_x64"
   },
   {
     "cmd": [],
@@ -3991,7 +4023,7 @@
       "--build-exit-status",
       "0",
       "--build-step-name",
-      "build android_release_arm64",
+      "build android_profile_x64",
       "--goma-stats-file",
       "[TMP_BASE]/goma_stats",
       "--goma-counterz-file",
@@ -4057,7 +4089,7 @@
     "cmd": [
       "[CACHE]/builder/engine/src/flutter/tools/gn",
       "--android",
-      "--runtime-mode=profile",
+      "--runtime-mode=release",
       "--android-cpu=x64"
     ],
     "cwd": "[CACHE]/builder",
@@ -4075,7 +4107,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "gn --android --runtime-mode=profile --android-cpu=x64"
+    "name": "gn --android --runtime-mode=release --android-cpu=x64"
   },
   {
     "cmd": [],
@@ -4178,7 +4210,7 @@
       "-j",
       "80",
       "-C",
-      "[CACHE]/builder/engine/src/out/android_profile_x64"
+      "[CACHE]/builder/engine/src/out/android_release_x64"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -4187,7 +4219,7 @@
       "GOMA_DIR": "[CACHE]/goma/client",
       "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
-    "name": "build android_profile_x64"
+    "name": "build android_release_x64"
   },
   {
     "cmd": [],
@@ -4306,7 +4338,7 @@
       "--build-exit-status",
       "0",
       "--build-step-name",
-      "build android_profile_x64",
+      "build android_release_x64",
       "--goma-stats-file",
       "[TMP_BASE]/goma_stats",
       "--goma-counterz-file",
@@ -4372,8 +4404,8 @@
     "cmd": [
       "[CACHE]/builder/engine/src/flutter/tools/gn",
       "--android",
-      "--runtime-mode=release",
-      "--android-cpu=x64"
+      "--android-cpu=x64",
+      "--no-lto"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -4390,7 +4422,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "gn --android --runtime-mode=release --android-cpu=x64"
+    "name": "gn --android --android-cpu=x64 --no-lto"
   },
   {
     "cmd": [],
@@ -4493,7 +4525,7 @@
       "-j",
       "80",
       "-C",
-      "[CACHE]/builder/engine/src/out/android_release_x64"
+      "[CACHE]/builder/engine/src/out/android_debug_x64"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -4502,7 +4534,7 @@
       "GOMA_DIR": "[CACHE]/goma/client",
       "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
-    "name": "build android_release_x64"
+    "name": "build android_debug_x64"
   },
   {
     "cmd": [],
@@ -4621,7 +4653,7 @@
       "--build-exit-status",
       "0",
       "--build-step-name",
-      "build android_release_x64",
+      "build android_debug_x64",
       "--goma-stats-file",
       "[TMP_BASE]/goma_stats",
       "--goma-counterz-file",
@@ -4687,7 +4719,7 @@
     "cmd": [
       "[CACHE]/builder/engine/src/flutter/tools/gn",
       "--android",
-      "--android-cpu=x64",
+      "--android-cpu=x86",
       "--no-lto"
     ],
     "cwd": "[CACHE]/builder",
@@ -4705,7 +4737,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "gn --android --android-cpu=x64 --no-lto"
+    "name": "gn --android --android-cpu=x86 --no-lto"
   },
   {
     "cmd": [],
@@ -4808,7 +4840,7 @@
       "-j",
       "80",
       "-C",
-      "[CACHE]/builder/engine/src/out/android_debug_x64"
+      "[CACHE]/builder/engine/src/out/android_debug_x86"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -4817,7 +4849,7 @@
       "GOMA_DIR": "[CACHE]/goma/client",
       "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
     },
-    "name": "build android_debug_x64"
+    "name": "build android_debug_x86"
   },
   {
     "cmd": [],
@@ -4936,7 +4968,7 @@
       "--build-exit-status",
       "0",
       "--build-step-name",
-      "build android_debug_x64",
+      "build android_debug_x86",
       "--goma-stats-file",
       "[TMP_BASE]/goma_stats",
       "--goma-counterz-file",
@@ -5000,321 +5032,6 @@
   },
   {
     "cmd": [
-      "[CACHE]/builder/engine/src/flutter/tools/gn",
-      "--android",
-      "--android-cpu=x86",
-      "--no-lto"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
-      "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "name": "gn --android --android-cpu=x86 --no-lto"
-  },
-  {
-    "cmd": [],
-    "name": "preprocess_for_goma (16)"
-  },
-  {
-    "cmd": [
-      "vpython",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0777",
-      "[CACHE]/goma/data/flutter_engine_linux"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
-      "GOMA_DIR": "[CACHE]/goma/client",
-      "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",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "[CACHE]/goma/client/goma_ctl.py",
-      "restart"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "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",
-      "GOMA_DUMP_COUNTERZ_FILE": "[TMP_BASE]/goma_counterz",
-      "GOMA_DUMP_STATS_FILE": "[TMP_BASE]/goma_stats",
-      "GOMA_ENABLE_COUNTERZ": "true",
-      "GOMA_HERMETIC": "error",
-      "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
-    },
-    "infra_step": true,
-    "name": "preprocess_for_goma (16).start_goma",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LINK@cloudtail@https://console.cloud.google.com/logs/viewer?project=goma-logs&resource=gce_instance%2Finstance_id%2Ffakevm999-m9@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "preprocess_for_goma (16).goma_with_global_service_account",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "RECIPE_REPO[build]/scripts/tools/runit.py",
-      "--show-path",
-      "--with-third-party-lib",
-      "--",
-      "python",
-      "RECIPE_MODULE[build::goma]/resources/cloudtail_utils.py",
-      "start",
-      "--cloudtail-path",
-      "cloudtail",
-      "--pid-file",
-      "[TMP_BASE]/cloudtail.pid",
-      "--cloudtail-service-account-json",
-      "/creds/service_accounts/service-account-goma-cloudtail.json"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
-      "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
-    },
-    "infra_step": true,
-    "name": "preprocess_for_goma (16).start cloudtail",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
-      "-j",
-      "80",
-      "-C",
-      "[CACHE]/builder/engine/src/out/android_debug_x86"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
-      "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
-    },
-    "name": "build android_debug_x86"
-  },
-  {
-    "cmd": [],
-    "name": "postprocess_for_goma (16)"
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "[CACHE]/goma/client/goma_ctl.py",
-      "jsonstatus",
-      "[TMP_BASE]/goma_jsonstatus.json"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "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",
-      "GOMA_DUMP_COUNTERZ_FILE": "[TMP_BASE]/goma_counterz",
-      "GOMA_DUMP_STATS_FILE": "[TMP_BASE]/goma_stats",
-      "GOMA_ENABLE_COUNTERZ": "true",
-      "GOMA_HERMETIC": "error",
-      "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
-    },
-    "name": "postprocess_for_goma (16).goma_jsonstatus",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"notice\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@    {@@@",
-      "@@@STEP_LOG_LINE@json.output@      \"infra_status\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"num_user_error\": 0, @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"ping_status_code\": 200@@@",
-      "@@@STEP_LOG_LINE@json.output@      }@@@",
-      "@@@STEP_LOG_LINE@json.output@    }@@@",
-      "@@@STEP_LOG_LINE@json.output@  ]@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "[CACHE]/goma/client/goma_ctl.py",
-      "stat"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "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",
-      "GOMA_DUMP_COUNTERZ_FILE": "[TMP_BASE]/goma_counterz",
-      "GOMA_DUMP_STATS_FILE": "[TMP_BASE]/goma_stats",
-      "GOMA_ENABLE_COUNTERZ": "true",
-      "GOMA_HERMETIC": "error",
-      "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
-    },
-    "name": "postprocess_for_goma (16).goma_stat",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "[CACHE]/goma/client/goma_ctl.py",
-      "stop"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "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",
-      "GOMA_DUMP_COUNTERZ_FILE": "[TMP_BASE]/goma_counterz",
-      "GOMA_DUMP_STATS_FILE": "[TMP_BASE]/goma_stats",
-      "GOMA_ENABLE_COUNTERZ": "true",
-      "GOMA_HERMETIC": "error",
-      "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
-    },
-    "name": "postprocess_for_goma (16).stop_goma",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython",
-      "-u",
-      "RECIPE_REPO[build]/scripts/tools/runit.py",
-      "--show-path",
-      "--",
-      "python",
-      "RECIPE_REPO[build]/recipes/upload_goma_logs.py",
-      "--upload-compiler-proxy-info",
-      "--log-url-json-file",
-      "/path/to/tmp/json",
-      "--gsutil-py-path",
-      "RECIPE_REPO[depot_tools]/gsutil.py",
-      "--bqupload-path",
-      "[CACHE]/goma/bqupload/bqupload",
-      "--bigquery-service-account-json",
-      "/creds/service_accounts/service-account-goma-bigquery.json",
-      "--json-status",
-      "[TMP_BASE]/goma_jsonstatus.json",
-      "--build-exit-status",
-      "0",
-      "--build-step-name",
-      "build android_debug_x86",
-      "--goma-stats-file",
-      "[TMP_BASE]/goma_stats",
-      "--goma-counterz-file",
-      "[TMP_BASE]/goma_counterz",
-      "--goma-crash-report-id-file",
-      "[TMP_BASE]/crash_report_id",
-      "--build-id",
-      "8945511751514863184",
-      "--builder-id-json",
-      "{\"bucket\": \"ci\", \"builder\": \"flutter-engine-linux\", \"project\": \"project\"}",
-      "--is-luci",
-      "--buildbot-buildername",
-      "flutter-engine-linux",
-      "--buildbot-slavename",
-      "fake-bot-id"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
-      "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
-    },
-    "name": "postprocess_for_goma (16).upload_log",
-    "timeout": 300,
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"compiler_proxy_log\": \"https://chromium-build-stats.appspot.com/compiler_proxy_log/2017/03/30/build11-m1/compiler_proxy.exe.BUILD11-M1.chrome-bot.log.INFO.20170329-222936.4420.gz\"@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@",
-      "@@@STEP_LINK@compiler_proxy_log@https://chromium-build-stats.appspot.com/compiler_proxy_log/2017/03/30/build11-m1/compiler_proxy.exe.BUILD11-M1.chrome-bot.log.INFO.20170329-222936.4420.gz@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "RECIPE_REPO[build]/scripts/tools/runit.py",
-      "--show-path",
-      "--with-third-party-lib",
-      "--",
-      "python",
-      "RECIPE_MODULE[build::goma]/resources/cloudtail_utils.py",
-      "stop",
-      "--killed-pid-file",
-      "[TMP_BASE]/cloudtail.pid"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
-      "ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
-      "GOMA_DIR": "[CACHE]/goma/client",
-      "PATH": "[CACHE]/builder/engine/src/third_party/dart/tools/sdks/dart-sdk/bin:<PATH>"
-    },
-    "infra_step": true,
-    "name": "postprocess_for_goma (16).stop cloudtail",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
       "[CACHE]/builder/flutter/bin/flutter",
       "config",
       "--no-analytics"
diff --git a/recipes/dart/flutter_engine.py b/recipes/dart/flutter_engine.py
index c303570..257df10 100644
--- a/recipes/dart/flutter_engine.py
+++ b/recipes/dart/flutter_engine.py
@@ -116,7 +116,6 @@
   RunGN(api, engine_src, '--unoptimized')
   Build(api, engine_src, 'host_debug_unopt')
   # analyze step needs dart ui sources
-  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',