Fix Windows Android gen_snapshot targets

led run of Windows Android AOT Engine:
https://ci.chromium.org/raw/build/logs.chromium.org/flutter/led/zra_google.com/90710853d4de920c1adeb66b2c3cb7021cc5f4b196fdd59875bab93de7ecc979/+/build.proto?server=chromium-swarm.appspot.com

Change-Id: If0e8b4d609fd6584fd1e34ce97cb4437c8b016b5
Reviewed-on: https://flutter-review.googlesource.com/c/recipes/+/35320
Commit-Queue: Zach Anderson <zra@google.com>
Reviewed-by: Godofredo Contreras <godofredoc@google.com>
diff --git a/recipes/engine/engine.expected/win.json b/recipes/engine/engine.expected/win.json
index 993ce97..a2236dd 100644
--- a/recipes/engine/engine.expected/win.json
+++ b/recipes/engine/engine.expected/win.json
@@ -1562,7 +1562,7 @@
       "-C",
       "[CACHE]\\builder\\src\\out/host_profile",
       "windows",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1602,7 +1602,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build host_profile windows gen_snapshot"
+    "name": "build host_profile windows flutter:gen_snapshot"
   },
   {
     "cmd": [],
@@ -2068,7 +2068,7 @@
       "-C",
       "[CACHE]\\builder\\src\\out/host_release",
       "windows",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -2108,7 +2108,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build host_release windows gen_snapshot"
+    "name": "build host_release windows flutter:gen_snapshot"
   },
   {
     "cmd": [],
@@ -3652,7 +3652,7 @@
       "1024",
       "-C",
       "[CACHE]\\builder\\src\\out/android_profile",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -3692,7 +3692,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build android_profile gen_snapshot"
+    "name": "build android_profile flutter:gen_snapshot"
   },
   {
     "cmd": [],
@@ -4111,7 +4111,7 @@
       "1024",
       "-C",
       "[CACHE]\\builder\\src\\out/android_profile_arm64",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -4151,7 +4151,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build android_profile_arm64 gen_snapshot"
+    "name": "build android_profile_arm64 flutter:gen_snapshot"
   },
   {
     "cmd": [],
@@ -4570,7 +4570,7 @@
       "1024",
       "-C",
       "[CACHE]\\builder\\src\\out/android_profile_x64",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -4610,7 +4610,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build android_profile_x64 gen_snapshot"
+    "name": "build android_profile_x64 flutter:gen_snapshot"
   },
   {
     "cmd": [],
@@ -5029,7 +5029,7 @@
       "1024",
       "-C",
       "[CACHE]\\builder\\src\\out/android_release",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -5069,7 +5069,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build android_release gen_snapshot"
+    "name": "build android_release flutter:gen_snapshot"
   },
   {
     "cmd": [],
@@ -5488,7 +5488,7 @@
       "1024",
       "-C",
       "[CACHE]\\builder\\src\\out/android_release_arm64",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -5528,7 +5528,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build android_release_arm64 gen_snapshot"
+    "name": "build android_release_arm64 flutter:gen_snapshot"
   },
   {
     "cmd": [],
@@ -5947,7 +5947,7 @@
       "1024",
       "-C",
       "[CACHE]\\builder\\src\\out/android_release_x64",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -5987,7 +5987,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build android_release_x64 gen_snapshot"
+    "name": "build android_release_x64 flutter:gen_snapshot"
   },
   {
     "cmd": [],
diff --git a/recipes/engine/engine.expected/win_font_subset.json b/recipes/engine/engine.expected/win_font_subset.json
index 0e26926..8f99ffe 100644
--- a/recipes/engine/engine.expected/win_font_subset.json
+++ b/recipes/engine/engine.expected/win_font_subset.json
@@ -1562,7 +1562,7 @@
       "-C",
       "[CACHE]\\builder\\src\\out/host_profile",
       "windows",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1602,7 +1602,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build host_profile windows gen_snapshot"
+    "name": "build host_profile windows flutter:gen_snapshot"
   },
   {
     "cmd": [],
@@ -2068,7 +2068,7 @@
       "-C",
       "[CACHE]\\builder\\src\\out/host_release",
       "windows",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -2108,7 +2108,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build host_release windows gen_snapshot"
+    "name": "build host_release windows flutter:gen_snapshot"
   },
   {
     "cmd": [],
@@ -4111,7 +4111,7 @@
       "1024",
       "-C",
       "[CACHE]\\builder\\src\\out/android_profile",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -4151,7 +4151,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build android_profile gen_snapshot"
+    "name": "build android_profile flutter:gen_snapshot"
   },
   {
     "cmd": [],
@@ -4570,7 +4570,7 @@
       "1024",
       "-C",
       "[CACHE]\\builder\\src\\out/android_profile_arm64",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -4610,7 +4610,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build android_profile_arm64 gen_snapshot"
+    "name": "build android_profile_arm64 flutter:gen_snapshot"
   },
   {
     "cmd": [],
@@ -5029,7 +5029,7 @@
       "1024",
       "-C",
       "[CACHE]\\builder\\src\\out/android_profile_x64",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -5069,7 +5069,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build android_profile_x64 gen_snapshot"
+    "name": "build android_profile_x64 flutter:gen_snapshot"
   },
   {
     "cmd": [],
@@ -5488,7 +5488,7 @@
       "1024",
       "-C",
       "[CACHE]\\builder\\src\\out/android_release",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -5528,7 +5528,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build android_release gen_snapshot"
+    "name": "build android_release flutter:gen_snapshot"
   },
   {
     "cmd": [],
@@ -5947,7 +5947,7 @@
       "1024",
       "-C",
       "[CACHE]\\builder\\src\\out/android_release_arm64",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -5987,7 +5987,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build android_release_arm64 gen_snapshot"
+    "name": "build android_release_arm64 flutter:gen_snapshot"
   },
   {
     "cmd": [],
@@ -6406,7 +6406,7 @@
       "1024",
       "-C",
       "[CACHE]\\builder\\src\\out/android_release_x64",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -6446,7 +6446,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build android_release_x64 gen_snapshot"
+    "name": "build android_release_x64 flutter:gen_snapshot"
   },
   {
     "cmd": [],
diff --git a/recipes/engine/engine.expected/win_no_lto.json b/recipes/engine/engine.expected/win_no_lto.json
index 9b2e16c..ceaba55 100644
--- a/recipes/engine/engine.expected/win_no_lto.json
+++ b/recipes/engine/engine.expected/win_no_lto.json
@@ -1562,7 +1562,7 @@
       "-C",
       "[CACHE]\\builder\\src\\out/host_profile",
       "windows",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1602,7 +1602,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build host_profile windows gen_snapshot"
+    "name": "build host_profile windows flutter:gen_snapshot"
   },
   {
     "cmd": [],
@@ -2068,7 +2068,7 @@
       "-C",
       "[CACHE]\\builder\\src\\out/host_release",
       "windows",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -2108,7 +2108,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build host_release windows gen_snapshot"
+    "name": "build host_release windows flutter:gen_snapshot"
   },
   {
     "cmd": [],
@@ -3658,7 +3658,7 @@
       "1024",
       "-C",
       "[CACHE]\\builder\\src\\out/android_profile",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -3698,7 +3698,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build android_profile gen_snapshot"
+    "name": "build android_profile flutter:gen_snapshot"
   },
   {
     "cmd": [],
@@ -4117,7 +4117,7 @@
       "1024",
       "-C",
       "[CACHE]\\builder\\src\\out/android_profile_arm64",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -4157,7 +4157,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build android_profile_arm64 gen_snapshot"
+    "name": "build android_profile_arm64 flutter:gen_snapshot"
   },
   {
     "cmd": [],
@@ -4576,7 +4576,7 @@
       "1024",
       "-C",
       "[CACHE]\\builder\\src\\out/android_profile_x64",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -4616,7 +4616,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build android_profile_x64 gen_snapshot"
+    "name": "build android_profile_x64 flutter:gen_snapshot"
   },
   {
     "cmd": [],
@@ -5035,7 +5035,7 @@
       "1024",
       "-C",
       "[CACHE]\\builder\\src\\out/android_release",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -5075,7 +5075,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build android_release gen_snapshot"
+    "name": "build android_release flutter:gen_snapshot"
   },
   {
     "cmd": [],
@@ -5494,7 +5494,7 @@
       "1024",
       "-C",
       "[CACHE]\\builder\\src\\out/android_release_arm64",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -5534,7 +5534,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build android_release_arm64 gen_snapshot"
+    "name": "build android_release_arm64 flutter:gen_snapshot"
   },
   {
     "cmd": [],
@@ -5953,7 +5953,7 @@
       "1024",
       "-C",
       "[CACHE]\\builder\\src\\out/android_release_x64",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -5993,7 +5993,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build android_release_x64 gen_snapshot"
+    "name": "build android_release_x64 flutter:gen_snapshot"
   },
   {
     "cmd": [],
diff --git a/recipes/engine/engine.expected/win_no_lto_font_subset.json b/recipes/engine/engine.expected/win_no_lto_font_subset.json
index 93f832f..aab467c 100644
--- a/recipes/engine/engine.expected/win_no_lto_font_subset.json
+++ b/recipes/engine/engine.expected/win_no_lto_font_subset.json
@@ -1562,7 +1562,7 @@
       "-C",
       "[CACHE]\\builder\\src\\out/host_profile",
       "windows",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1602,7 +1602,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build host_profile windows gen_snapshot"
+    "name": "build host_profile windows flutter:gen_snapshot"
   },
   {
     "cmd": [],
@@ -2068,7 +2068,7 @@
       "-C",
       "[CACHE]\\builder\\src\\out/host_release",
       "windows",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -2108,7 +2108,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build host_release windows gen_snapshot"
+    "name": "build host_release windows flutter:gen_snapshot"
   },
   {
     "cmd": [],
@@ -4117,7 +4117,7 @@
       "1024",
       "-C",
       "[CACHE]\\builder\\src\\out/android_profile",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -4157,7 +4157,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build android_profile gen_snapshot"
+    "name": "build android_profile flutter:gen_snapshot"
   },
   {
     "cmd": [],
@@ -4576,7 +4576,7 @@
       "1024",
       "-C",
       "[CACHE]\\builder\\src\\out/android_profile_arm64",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -4616,7 +4616,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build android_profile_arm64 gen_snapshot"
+    "name": "build android_profile_arm64 flutter:gen_snapshot"
   },
   {
     "cmd": [],
@@ -5035,7 +5035,7 @@
       "1024",
       "-C",
       "[CACHE]\\builder\\src\\out/android_profile_x64",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -5075,7 +5075,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build android_profile_x64 gen_snapshot"
+    "name": "build android_profile_x64 flutter:gen_snapshot"
   },
   {
     "cmd": [],
@@ -5494,7 +5494,7 @@
       "1024",
       "-C",
       "[CACHE]\\builder\\src\\out/android_release",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -5534,7 +5534,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build android_release gen_snapshot"
+    "name": "build android_release flutter:gen_snapshot"
   },
   {
     "cmd": [],
@@ -5953,7 +5953,7 @@
       "1024",
       "-C",
       "[CACHE]\\builder\\src\\out/android_release_arm64",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -5993,7 +5993,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build android_release_arm64 gen_snapshot"
+    "name": "build android_release_arm64 flutter:gen_snapshot"
   },
   {
     "cmd": [],
@@ -6412,7 +6412,7 @@
       "1024",
       "-C",
       "[CACHE]\\builder\\src\\out/android_release_x64",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -6452,7 +6452,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build android_release_x64 gen_snapshot"
+    "name": "build android_release_x64 flutter:gen_snapshot"
   },
   {
     "cmd": [],
diff --git a/recipes/engine/engine.expected/win_publish_cipd.json b/recipes/engine/engine.expected/win_publish_cipd.json
index 993ce97..a2236dd 100644
--- a/recipes/engine/engine.expected/win_publish_cipd.json
+++ b/recipes/engine/engine.expected/win_publish_cipd.json
@@ -1562,7 +1562,7 @@
       "-C",
       "[CACHE]\\builder\\src\\out/host_profile",
       "windows",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1602,7 +1602,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build host_profile windows gen_snapshot"
+    "name": "build host_profile windows flutter:gen_snapshot"
   },
   {
     "cmd": [],
@@ -2068,7 +2068,7 @@
       "-C",
       "[CACHE]\\builder\\src\\out/host_release",
       "windows",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -2108,7 +2108,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build host_release windows gen_snapshot"
+    "name": "build host_release windows flutter:gen_snapshot"
   },
   {
     "cmd": [],
@@ -3652,7 +3652,7 @@
       "1024",
       "-C",
       "[CACHE]\\builder\\src\\out/android_profile",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -3692,7 +3692,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build android_profile gen_snapshot"
+    "name": "build android_profile flutter:gen_snapshot"
   },
   {
     "cmd": [],
@@ -4111,7 +4111,7 @@
       "1024",
       "-C",
       "[CACHE]\\builder\\src\\out/android_profile_arm64",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -4151,7 +4151,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build android_profile_arm64 gen_snapshot"
+    "name": "build android_profile_arm64 flutter:gen_snapshot"
   },
   {
     "cmd": [],
@@ -4570,7 +4570,7 @@
       "1024",
       "-C",
       "[CACHE]\\builder\\src\\out/android_profile_x64",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -4610,7 +4610,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build android_profile_x64 gen_snapshot"
+    "name": "build android_profile_x64 flutter:gen_snapshot"
   },
   {
     "cmd": [],
@@ -5029,7 +5029,7 @@
       "1024",
       "-C",
       "[CACHE]\\builder\\src\\out/android_release",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -5069,7 +5069,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build android_release gen_snapshot"
+    "name": "build android_release flutter:gen_snapshot"
   },
   {
     "cmd": [],
@@ -5488,7 +5488,7 @@
       "1024",
       "-C",
       "[CACHE]\\builder\\src\\out/android_release_arm64",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -5528,7 +5528,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build android_release_arm64 gen_snapshot"
+    "name": "build android_release_arm64 flutter:gen_snapshot"
   },
   {
     "cmd": [],
@@ -5947,7 +5947,7 @@
       "1024",
       "-C",
       "[CACHE]\\builder\\src\\out/android_release_x64",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -5987,7 +5987,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build android_release_x64 gen_snapshot"
+    "name": "build android_release_x64 flutter:gen_snapshot"
   },
   {
     "cmd": [],
diff --git a/recipes/engine/engine.expected/win_publish_cipd_font_subset.json b/recipes/engine/engine.expected/win_publish_cipd_font_subset.json
index 0e26926..8f99ffe 100644
--- a/recipes/engine/engine.expected/win_publish_cipd_font_subset.json
+++ b/recipes/engine/engine.expected/win_publish_cipd_font_subset.json
@@ -1562,7 +1562,7 @@
       "-C",
       "[CACHE]\\builder\\src\\out/host_profile",
       "windows",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1602,7 +1602,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build host_profile windows gen_snapshot"
+    "name": "build host_profile windows flutter:gen_snapshot"
   },
   {
     "cmd": [],
@@ -2068,7 +2068,7 @@
       "-C",
       "[CACHE]\\builder\\src\\out/host_release",
       "windows",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -2108,7 +2108,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build host_release windows gen_snapshot"
+    "name": "build host_release windows flutter:gen_snapshot"
   },
   {
     "cmd": [],
@@ -4111,7 +4111,7 @@
       "1024",
       "-C",
       "[CACHE]\\builder\\src\\out/android_profile",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -4151,7 +4151,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build android_profile gen_snapshot"
+    "name": "build android_profile flutter:gen_snapshot"
   },
   {
     "cmd": [],
@@ -4570,7 +4570,7 @@
       "1024",
       "-C",
       "[CACHE]\\builder\\src\\out/android_profile_arm64",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -4610,7 +4610,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build android_profile_arm64 gen_snapshot"
+    "name": "build android_profile_arm64 flutter:gen_snapshot"
   },
   {
     "cmd": [],
@@ -5029,7 +5029,7 @@
       "1024",
       "-C",
       "[CACHE]\\builder\\src\\out/android_profile_x64",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -5069,7 +5069,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build android_profile_x64 gen_snapshot"
+    "name": "build android_profile_x64 flutter:gen_snapshot"
   },
   {
     "cmd": [],
@@ -5488,7 +5488,7 @@
       "1024",
       "-C",
       "[CACHE]\\builder\\src\\out/android_release",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -5528,7 +5528,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build android_release gen_snapshot"
+    "name": "build android_release flutter:gen_snapshot"
   },
   {
     "cmd": [],
@@ -5947,7 +5947,7 @@
       "1024",
       "-C",
       "[CACHE]\\builder\\src\\out/android_release_arm64",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -5987,7 +5987,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build android_release_arm64 gen_snapshot"
+    "name": "build android_release_arm64 flutter:gen_snapshot"
   },
   {
     "cmd": [],
@@ -6406,7 +6406,7 @@
       "1024",
       "-C",
       "[CACHE]\\builder\\src\\out/android_release_x64",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -6446,7 +6446,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build android_release_x64 gen_snapshot"
+    "name": "build android_release_x64 flutter:gen_snapshot"
   },
   {
     "cmd": [],
diff --git a/recipes/engine/engine.expected/win_publish_cipd_no_lto.json b/recipes/engine/engine.expected/win_publish_cipd_no_lto.json
index 9b2e16c..ceaba55 100644
--- a/recipes/engine/engine.expected/win_publish_cipd_no_lto.json
+++ b/recipes/engine/engine.expected/win_publish_cipd_no_lto.json
@@ -1562,7 +1562,7 @@
       "-C",
       "[CACHE]\\builder\\src\\out/host_profile",
       "windows",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1602,7 +1602,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build host_profile windows gen_snapshot"
+    "name": "build host_profile windows flutter:gen_snapshot"
   },
   {
     "cmd": [],
@@ -2068,7 +2068,7 @@
       "-C",
       "[CACHE]\\builder\\src\\out/host_release",
       "windows",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -2108,7 +2108,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build host_release windows gen_snapshot"
+    "name": "build host_release windows flutter:gen_snapshot"
   },
   {
     "cmd": [],
@@ -3658,7 +3658,7 @@
       "1024",
       "-C",
       "[CACHE]\\builder\\src\\out/android_profile",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -3698,7 +3698,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build android_profile gen_snapshot"
+    "name": "build android_profile flutter:gen_snapshot"
   },
   {
     "cmd": [],
@@ -4117,7 +4117,7 @@
       "1024",
       "-C",
       "[CACHE]\\builder\\src\\out/android_profile_arm64",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -4157,7 +4157,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build android_profile_arm64 gen_snapshot"
+    "name": "build android_profile_arm64 flutter:gen_snapshot"
   },
   {
     "cmd": [],
@@ -4576,7 +4576,7 @@
       "1024",
       "-C",
       "[CACHE]\\builder\\src\\out/android_profile_x64",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -4616,7 +4616,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build android_profile_x64 gen_snapshot"
+    "name": "build android_profile_x64 flutter:gen_snapshot"
   },
   {
     "cmd": [],
@@ -5035,7 +5035,7 @@
       "1024",
       "-C",
       "[CACHE]\\builder\\src\\out/android_release",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -5075,7 +5075,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build android_release gen_snapshot"
+    "name": "build android_release flutter:gen_snapshot"
   },
   {
     "cmd": [],
@@ -5494,7 +5494,7 @@
       "1024",
       "-C",
       "[CACHE]\\builder\\src\\out/android_release_arm64",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -5534,7 +5534,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build android_release_arm64 gen_snapshot"
+    "name": "build android_release_arm64 flutter:gen_snapshot"
   },
   {
     "cmd": [],
@@ -5953,7 +5953,7 @@
       "1024",
       "-C",
       "[CACHE]\\builder\\src\\out/android_release_x64",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -5993,7 +5993,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build android_release_x64 gen_snapshot"
+    "name": "build android_release_x64 flutter:gen_snapshot"
   },
   {
     "cmd": [],
diff --git a/recipes/engine/engine.expected/win_publish_cipd_no_lto_font_subset.json b/recipes/engine/engine.expected/win_publish_cipd_no_lto_font_subset.json
index 93f832f..aab467c 100644
--- a/recipes/engine/engine.expected/win_publish_cipd_no_lto_font_subset.json
+++ b/recipes/engine/engine.expected/win_publish_cipd_no_lto_font_subset.json
@@ -1562,7 +1562,7 @@
       "-C",
       "[CACHE]\\builder\\src\\out/host_profile",
       "windows",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1602,7 +1602,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build host_profile windows gen_snapshot"
+    "name": "build host_profile windows flutter:gen_snapshot"
   },
   {
     "cmd": [],
@@ -2068,7 +2068,7 @@
       "-C",
       "[CACHE]\\builder\\src\\out/host_release",
       "windows",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -2108,7 +2108,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build host_release windows gen_snapshot"
+    "name": "build host_release windows flutter:gen_snapshot"
   },
   {
     "cmd": [],
@@ -4117,7 +4117,7 @@
       "1024",
       "-C",
       "[CACHE]\\builder\\src\\out/android_profile",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -4157,7 +4157,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build android_profile gen_snapshot"
+    "name": "build android_profile flutter:gen_snapshot"
   },
   {
     "cmd": [],
@@ -4576,7 +4576,7 @@
       "1024",
       "-C",
       "[CACHE]\\builder\\src\\out/android_profile_arm64",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -4616,7 +4616,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build android_profile_arm64 gen_snapshot"
+    "name": "build android_profile_arm64 flutter:gen_snapshot"
   },
   {
     "cmd": [],
@@ -5035,7 +5035,7 @@
       "1024",
       "-C",
       "[CACHE]\\builder\\src\\out/android_profile_x64",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -5075,7 +5075,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build android_profile_x64 gen_snapshot"
+    "name": "build android_profile_x64 flutter:gen_snapshot"
   },
   {
     "cmd": [],
@@ -5494,7 +5494,7 @@
       "1024",
       "-C",
       "[CACHE]\\builder\\src\\out/android_release",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -5534,7 +5534,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build android_release gen_snapshot"
+    "name": "build android_release flutter:gen_snapshot"
   },
   {
     "cmd": [],
@@ -5953,7 +5953,7 @@
       "1024",
       "-C",
       "[CACHE]\\builder\\src\\out/android_release_arm64",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -5993,7 +5993,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build android_release_arm64 gen_snapshot"
+    "name": "build android_release_arm64 flutter:gen_snapshot"
   },
   {
     "cmd": [],
@@ -6412,7 +6412,7 @@
       "1024",
       "-C",
       "[CACHE]\\builder\\src\\out/android_release_x64",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -6452,7 +6452,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build android_release_x64 gen_snapshot"
+    "name": "build android_release_x64 flutter:gen_snapshot"
   },
   {
     "cmd": [],
diff --git a/recipes/engine/engine.expected/win_upload.json b/recipes/engine/engine.expected/win_upload.json
index 2984d86..83c4c23 100644
--- a/recipes/engine/engine.expected/win_upload.json
+++ b/recipes/engine/engine.expected/win_upload.json
@@ -1562,7 +1562,7 @@
       "-C",
       "[CACHE]\\builder\\src\\out/host_profile",
       "windows",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1602,7 +1602,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build host_profile windows gen_snapshot"
+    "name": "build host_profile windows flutter:gen_snapshot"
   },
   {
     "cmd": [],
@@ -2068,7 +2068,7 @@
       "-C",
       "[CACHE]\\builder\\src\\out/host_release",
       "windows",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -2108,7 +2108,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build host_release windows gen_snapshot"
+    "name": "build host_release windows flutter:gen_snapshot"
   },
   {
     "cmd": [],
@@ -4120,7 +4120,7 @@
       "1024",
       "-C",
       "[CACHE]\\builder\\src\\out/android_profile",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -4160,7 +4160,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build android_profile gen_snapshot"
+    "name": "build android_profile flutter:gen_snapshot"
   },
   {
     "cmd": [],
@@ -4579,7 +4579,7 @@
       "1024",
       "-C",
       "[CACHE]\\builder\\src\\out/android_profile_arm64",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -4619,7 +4619,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build android_profile_arm64 gen_snapshot"
+    "name": "build android_profile_arm64 flutter:gen_snapshot"
   },
   {
     "cmd": [],
@@ -5038,7 +5038,7 @@
       "1024",
       "-C",
       "[CACHE]\\builder\\src\\out/android_profile_x64",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -5078,7 +5078,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build android_profile_x64 gen_snapshot"
+    "name": "build android_profile_x64 flutter:gen_snapshot"
   },
   {
     "cmd": [],
@@ -5497,7 +5497,7 @@
       "1024",
       "-C",
       "[CACHE]\\builder\\src\\out/android_release",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -5537,7 +5537,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build android_release gen_snapshot"
+    "name": "build android_release flutter:gen_snapshot"
   },
   {
     "cmd": [],
@@ -5956,7 +5956,7 @@
       "1024",
       "-C",
       "[CACHE]\\builder\\src\\out/android_release_arm64",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -5996,7 +5996,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build android_release_arm64 gen_snapshot"
+    "name": "build android_release_arm64 flutter:gen_snapshot"
   },
   {
     "cmd": [],
@@ -6415,7 +6415,7 @@
       "1024",
       "-C",
       "[CACHE]\\builder\\src\\out/android_release_x64",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -6455,7 +6455,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build android_release_x64 gen_snapshot"
+    "name": "build android_release_x64 flutter:gen_snapshot"
   },
   {
     "cmd": [],
diff --git a/recipes/engine/engine.expected/win_upload_font_subset.json b/recipes/engine/engine.expected/win_upload_font_subset.json
index 8129a32..1f31d88 100644
--- a/recipes/engine/engine.expected/win_upload_font_subset.json
+++ b/recipes/engine/engine.expected/win_upload_font_subset.json
@@ -1562,7 +1562,7 @@
       "-C",
       "[CACHE]\\builder\\src\\out/host_profile",
       "windows",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1602,7 +1602,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build host_profile windows gen_snapshot"
+    "name": "build host_profile windows flutter:gen_snapshot"
   },
   {
     "cmd": [],
@@ -2068,7 +2068,7 @@
       "-C",
       "[CACHE]\\builder\\src\\out/host_release",
       "windows",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -2108,7 +2108,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build host_release windows gen_snapshot"
+    "name": "build host_release windows flutter:gen_snapshot"
   },
   {
     "cmd": [],
@@ -4631,7 +4631,7 @@
       "1024",
       "-C",
       "[CACHE]\\builder\\src\\out/android_profile",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -4671,7 +4671,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build android_profile gen_snapshot"
+    "name": "build android_profile flutter:gen_snapshot"
   },
   {
     "cmd": [],
@@ -5090,7 +5090,7 @@
       "1024",
       "-C",
       "[CACHE]\\builder\\src\\out/android_profile_arm64",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -5130,7 +5130,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build android_profile_arm64 gen_snapshot"
+    "name": "build android_profile_arm64 flutter:gen_snapshot"
   },
   {
     "cmd": [],
@@ -5549,7 +5549,7 @@
       "1024",
       "-C",
       "[CACHE]\\builder\\src\\out/android_profile_x64",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -5589,7 +5589,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build android_profile_x64 gen_snapshot"
+    "name": "build android_profile_x64 flutter:gen_snapshot"
   },
   {
     "cmd": [],
@@ -6008,7 +6008,7 @@
       "1024",
       "-C",
       "[CACHE]\\builder\\src\\out/android_release",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -6048,7 +6048,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build android_release gen_snapshot"
+    "name": "build android_release flutter:gen_snapshot"
   },
   {
     "cmd": [],
@@ -6467,7 +6467,7 @@
       "1024",
       "-C",
       "[CACHE]\\builder\\src\\out/android_release_arm64",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -6507,7 +6507,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build android_release_arm64 gen_snapshot"
+    "name": "build android_release_arm64 flutter:gen_snapshot"
   },
   {
     "cmd": [],
@@ -6926,7 +6926,7 @@
       "1024",
       "-C",
       "[CACHE]\\builder\\src\\out/android_release_x64",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -6966,7 +6966,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build android_release_x64 gen_snapshot"
+    "name": "build android_release_x64 flutter:gen_snapshot"
   },
   {
     "cmd": [],
diff --git a/recipes/engine/engine.expected/win_upload_no_lto.json b/recipes/engine/engine.expected/win_upload_no_lto.json
index 8073538..345078f 100644
--- a/recipes/engine/engine.expected/win_upload_no_lto.json
+++ b/recipes/engine/engine.expected/win_upload_no_lto.json
@@ -1562,7 +1562,7 @@
       "-C",
       "[CACHE]\\builder\\src\\out/host_profile",
       "windows",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1602,7 +1602,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build host_profile windows gen_snapshot"
+    "name": "build host_profile windows flutter:gen_snapshot"
   },
   {
     "cmd": [],
@@ -2068,7 +2068,7 @@
       "-C",
       "[CACHE]\\builder\\src\\out/host_release",
       "windows",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -2108,7 +2108,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build host_release windows gen_snapshot"
+    "name": "build host_release windows flutter:gen_snapshot"
   },
   {
     "cmd": [],
@@ -4126,7 +4126,7 @@
       "1024",
       "-C",
       "[CACHE]\\builder\\src\\out/android_profile",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -4166,7 +4166,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build android_profile gen_snapshot"
+    "name": "build android_profile flutter:gen_snapshot"
   },
   {
     "cmd": [],
@@ -4585,7 +4585,7 @@
       "1024",
       "-C",
       "[CACHE]\\builder\\src\\out/android_profile_arm64",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -4625,7 +4625,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build android_profile_arm64 gen_snapshot"
+    "name": "build android_profile_arm64 flutter:gen_snapshot"
   },
   {
     "cmd": [],
@@ -5044,7 +5044,7 @@
       "1024",
       "-C",
       "[CACHE]\\builder\\src\\out/android_profile_x64",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -5084,7 +5084,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build android_profile_x64 gen_snapshot"
+    "name": "build android_profile_x64 flutter:gen_snapshot"
   },
   {
     "cmd": [],
@@ -5503,7 +5503,7 @@
       "1024",
       "-C",
       "[CACHE]\\builder\\src\\out/android_release",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -5543,7 +5543,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build android_release gen_snapshot"
+    "name": "build android_release flutter:gen_snapshot"
   },
   {
     "cmd": [],
@@ -5962,7 +5962,7 @@
       "1024",
       "-C",
       "[CACHE]\\builder\\src\\out/android_release_arm64",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -6002,7 +6002,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build android_release_arm64 gen_snapshot"
+    "name": "build android_release_arm64 flutter:gen_snapshot"
   },
   {
     "cmd": [],
@@ -6421,7 +6421,7 @@
       "1024",
       "-C",
       "[CACHE]\\builder\\src\\out/android_release_x64",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -6461,7 +6461,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build android_release_x64 gen_snapshot"
+    "name": "build android_release_x64 flutter:gen_snapshot"
   },
   {
     "cmd": [],
diff --git a/recipes/engine/engine.expected/win_upload_no_lto_font_subset.json b/recipes/engine/engine.expected/win_upload_no_lto_font_subset.json
index db8d9c4..b108a4c 100644
--- a/recipes/engine/engine.expected/win_upload_no_lto_font_subset.json
+++ b/recipes/engine/engine.expected/win_upload_no_lto_font_subset.json
@@ -1562,7 +1562,7 @@
       "-C",
       "[CACHE]\\builder\\src\\out/host_profile",
       "windows",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1602,7 +1602,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build host_profile windows gen_snapshot"
+    "name": "build host_profile windows flutter:gen_snapshot"
   },
   {
     "cmd": [],
@@ -2068,7 +2068,7 @@
       "-C",
       "[CACHE]\\builder\\src\\out/host_release",
       "windows",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -2108,7 +2108,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build host_release windows gen_snapshot"
+    "name": "build host_release windows flutter:gen_snapshot"
   },
   {
     "cmd": [],
@@ -4637,7 +4637,7 @@
       "1024",
       "-C",
       "[CACHE]\\builder\\src\\out/android_profile",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -4677,7 +4677,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build android_profile gen_snapshot"
+    "name": "build android_profile flutter:gen_snapshot"
   },
   {
     "cmd": [],
@@ -5096,7 +5096,7 @@
       "1024",
       "-C",
       "[CACHE]\\builder\\src\\out/android_profile_arm64",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -5136,7 +5136,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build android_profile_arm64 gen_snapshot"
+    "name": "build android_profile_arm64 flutter:gen_snapshot"
   },
   {
     "cmd": [],
@@ -5555,7 +5555,7 @@
       "1024",
       "-C",
       "[CACHE]\\builder\\src\\out/android_profile_x64",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -5595,7 +5595,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build android_profile_x64 gen_snapshot"
+    "name": "build android_profile_x64 flutter:gen_snapshot"
   },
   {
     "cmd": [],
@@ -6014,7 +6014,7 @@
       "1024",
       "-C",
       "[CACHE]\\builder\\src\\out/android_release",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -6054,7 +6054,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build android_release gen_snapshot"
+    "name": "build android_release flutter:gen_snapshot"
   },
   {
     "cmd": [],
@@ -6473,7 +6473,7 @@
       "1024",
       "-C",
       "[CACHE]\\builder\\src\\out/android_release_arm64",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -6513,7 +6513,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build android_release_arm64 gen_snapshot"
+    "name": "build android_release_arm64 flutter:gen_snapshot"
   },
   {
     "cmd": [],
@@ -6932,7 +6932,7 @@
       "1024",
       "-C",
       "[CACHE]\\builder\\src\\out/android_release_x64",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -6972,7 +6972,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build android_release_x64 gen_snapshot"
+    "name": "build android_release_x64 flutter:gen_snapshot"
   },
   {
     "cmd": [],
diff --git a/recipes/engine/engine.expected/win_upload_publish_cipd.json b/recipes/engine/engine.expected/win_upload_publish_cipd.json
index 2984d86..83c4c23 100644
--- a/recipes/engine/engine.expected/win_upload_publish_cipd.json
+++ b/recipes/engine/engine.expected/win_upload_publish_cipd.json
@@ -1562,7 +1562,7 @@
       "-C",
       "[CACHE]\\builder\\src\\out/host_profile",
       "windows",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1602,7 +1602,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build host_profile windows gen_snapshot"
+    "name": "build host_profile windows flutter:gen_snapshot"
   },
   {
     "cmd": [],
@@ -2068,7 +2068,7 @@
       "-C",
       "[CACHE]\\builder\\src\\out/host_release",
       "windows",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -2108,7 +2108,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build host_release windows gen_snapshot"
+    "name": "build host_release windows flutter:gen_snapshot"
   },
   {
     "cmd": [],
@@ -4120,7 +4120,7 @@
       "1024",
       "-C",
       "[CACHE]\\builder\\src\\out/android_profile",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -4160,7 +4160,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build android_profile gen_snapshot"
+    "name": "build android_profile flutter:gen_snapshot"
   },
   {
     "cmd": [],
@@ -4579,7 +4579,7 @@
       "1024",
       "-C",
       "[CACHE]\\builder\\src\\out/android_profile_arm64",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -4619,7 +4619,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build android_profile_arm64 gen_snapshot"
+    "name": "build android_profile_arm64 flutter:gen_snapshot"
   },
   {
     "cmd": [],
@@ -5038,7 +5038,7 @@
       "1024",
       "-C",
       "[CACHE]\\builder\\src\\out/android_profile_x64",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -5078,7 +5078,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build android_profile_x64 gen_snapshot"
+    "name": "build android_profile_x64 flutter:gen_snapshot"
   },
   {
     "cmd": [],
@@ -5497,7 +5497,7 @@
       "1024",
       "-C",
       "[CACHE]\\builder\\src\\out/android_release",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -5537,7 +5537,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build android_release gen_snapshot"
+    "name": "build android_release flutter:gen_snapshot"
   },
   {
     "cmd": [],
@@ -5956,7 +5956,7 @@
       "1024",
       "-C",
       "[CACHE]\\builder\\src\\out/android_release_arm64",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -5996,7 +5996,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build android_release_arm64 gen_snapshot"
+    "name": "build android_release_arm64 flutter:gen_snapshot"
   },
   {
     "cmd": [],
@@ -6415,7 +6415,7 @@
       "1024",
       "-C",
       "[CACHE]\\builder\\src\\out/android_release_x64",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -6455,7 +6455,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build android_release_x64 gen_snapshot"
+    "name": "build android_release_x64 flutter:gen_snapshot"
   },
   {
     "cmd": [],
diff --git a/recipes/engine/engine.expected/win_upload_publish_cipd_font_subset.json b/recipes/engine/engine.expected/win_upload_publish_cipd_font_subset.json
index 8129a32..1f31d88 100644
--- a/recipes/engine/engine.expected/win_upload_publish_cipd_font_subset.json
+++ b/recipes/engine/engine.expected/win_upload_publish_cipd_font_subset.json
@@ -1562,7 +1562,7 @@
       "-C",
       "[CACHE]\\builder\\src\\out/host_profile",
       "windows",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1602,7 +1602,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build host_profile windows gen_snapshot"
+    "name": "build host_profile windows flutter:gen_snapshot"
   },
   {
     "cmd": [],
@@ -2068,7 +2068,7 @@
       "-C",
       "[CACHE]\\builder\\src\\out/host_release",
       "windows",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -2108,7 +2108,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build host_release windows gen_snapshot"
+    "name": "build host_release windows flutter:gen_snapshot"
   },
   {
     "cmd": [],
@@ -4631,7 +4631,7 @@
       "1024",
       "-C",
       "[CACHE]\\builder\\src\\out/android_profile",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -4671,7 +4671,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build android_profile gen_snapshot"
+    "name": "build android_profile flutter:gen_snapshot"
   },
   {
     "cmd": [],
@@ -5090,7 +5090,7 @@
       "1024",
       "-C",
       "[CACHE]\\builder\\src\\out/android_profile_arm64",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -5130,7 +5130,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build android_profile_arm64 gen_snapshot"
+    "name": "build android_profile_arm64 flutter:gen_snapshot"
   },
   {
     "cmd": [],
@@ -5549,7 +5549,7 @@
       "1024",
       "-C",
       "[CACHE]\\builder\\src\\out/android_profile_x64",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -5589,7 +5589,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build android_profile_x64 gen_snapshot"
+    "name": "build android_profile_x64 flutter:gen_snapshot"
   },
   {
     "cmd": [],
@@ -6008,7 +6008,7 @@
       "1024",
       "-C",
       "[CACHE]\\builder\\src\\out/android_release",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -6048,7 +6048,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build android_release gen_snapshot"
+    "name": "build android_release flutter:gen_snapshot"
   },
   {
     "cmd": [],
@@ -6467,7 +6467,7 @@
       "1024",
       "-C",
       "[CACHE]\\builder\\src\\out/android_release_arm64",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -6507,7 +6507,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build android_release_arm64 gen_snapshot"
+    "name": "build android_release_arm64 flutter:gen_snapshot"
   },
   {
     "cmd": [],
@@ -6926,7 +6926,7 @@
       "1024",
       "-C",
       "[CACHE]\\builder\\src\\out/android_release_x64",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -6966,7 +6966,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build android_release_x64 gen_snapshot"
+    "name": "build android_release_x64 flutter:gen_snapshot"
   },
   {
     "cmd": [],
diff --git a/recipes/engine/engine.expected/win_upload_publish_cipd_no_lto.json b/recipes/engine/engine.expected/win_upload_publish_cipd_no_lto.json
index 8073538..345078f 100644
--- a/recipes/engine/engine.expected/win_upload_publish_cipd_no_lto.json
+++ b/recipes/engine/engine.expected/win_upload_publish_cipd_no_lto.json
@@ -1562,7 +1562,7 @@
       "-C",
       "[CACHE]\\builder\\src\\out/host_profile",
       "windows",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1602,7 +1602,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build host_profile windows gen_snapshot"
+    "name": "build host_profile windows flutter:gen_snapshot"
   },
   {
     "cmd": [],
@@ -2068,7 +2068,7 @@
       "-C",
       "[CACHE]\\builder\\src\\out/host_release",
       "windows",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -2108,7 +2108,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build host_release windows gen_snapshot"
+    "name": "build host_release windows flutter:gen_snapshot"
   },
   {
     "cmd": [],
@@ -4126,7 +4126,7 @@
       "1024",
       "-C",
       "[CACHE]\\builder\\src\\out/android_profile",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -4166,7 +4166,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build android_profile gen_snapshot"
+    "name": "build android_profile flutter:gen_snapshot"
   },
   {
     "cmd": [],
@@ -4585,7 +4585,7 @@
       "1024",
       "-C",
       "[CACHE]\\builder\\src\\out/android_profile_arm64",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -4625,7 +4625,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build android_profile_arm64 gen_snapshot"
+    "name": "build android_profile_arm64 flutter:gen_snapshot"
   },
   {
     "cmd": [],
@@ -5044,7 +5044,7 @@
       "1024",
       "-C",
       "[CACHE]\\builder\\src\\out/android_profile_x64",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -5084,7 +5084,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build android_profile_x64 gen_snapshot"
+    "name": "build android_profile_x64 flutter:gen_snapshot"
   },
   {
     "cmd": [],
@@ -5503,7 +5503,7 @@
       "1024",
       "-C",
       "[CACHE]\\builder\\src\\out/android_release",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -5543,7 +5543,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build android_release gen_snapshot"
+    "name": "build android_release flutter:gen_snapshot"
   },
   {
     "cmd": [],
@@ -5962,7 +5962,7 @@
       "1024",
       "-C",
       "[CACHE]\\builder\\src\\out/android_release_arm64",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -6002,7 +6002,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build android_release_arm64 gen_snapshot"
+    "name": "build android_release_arm64 flutter:gen_snapshot"
   },
   {
     "cmd": [],
@@ -6421,7 +6421,7 @@
       "1024",
       "-C",
       "[CACHE]\\builder\\src\\out/android_release_x64",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -6461,7 +6461,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build android_release_x64 gen_snapshot"
+    "name": "build android_release_x64 flutter:gen_snapshot"
   },
   {
     "cmd": [],
diff --git a/recipes/engine/engine.expected/win_upload_publish_cipd_no_lto_font_subset.json b/recipes/engine/engine.expected/win_upload_publish_cipd_no_lto_font_subset.json
index db8d9c4..b108a4c 100644
--- a/recipes/engine/engine.expected/win_upload_publish_cipd_no_lto_font_subset.json
+++ b/recipes/engine/engine.expected/win_upload_publish_cipd_no_lto_font_subset.json
@@ -1562,7 +1562,7 @@
       "-C",
       "[CACHE]\\builder\\src\\out/host_profile",
       "windows",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1602,7 +1602,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build host_profile windows gen_snapshot"
+    "name": "build host_profile windows flutter:gen_snapshot"
   },
   {
     "cmd": [],
@@ -2068,7 +2068,7 @@
       "-C",
       "[CACHE]\\builder\\src\\out/host_release",
       "windows",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -2108,7 +2108,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build host_release windows gen_snapshot"
+    "name": "build host_release windows flutter:gen_snapshot"
   },
   {
     "cmd": [],
@@ -4637,7 +4637,7 @@
       "1024",
       "-C",
       "[CACHE]\\builder\\src\\out/android_profile",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -4677,7 +4677,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build android_profile gen_snapshot"
+    "name": "build android_profile flutter:gen_snapshot"
   },
   {
     "cmd": [],
@@ -5096,7 +5096,7 @@
       "1024",
       "-C",
       "[CACHE]\\builder\\src\\out/android_profile_arm64",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -5136,7 +5136,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build android_profile_arm64 gen_snapshot"
+    "name": "build android_profile_arm64 flutter:gen_snapshot"
   },
   {
     "cmd": [],
@@ -5555,7 +5555,7 @@
       "1024",
       "-C",
       "[CACHE]\\builder\\src\\out/android_profile_x64",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -5595,7 +5595,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build android_profile_x64 gen_snapshot"
+    "name": "build android_profile_x64 flutter:gen_snapshot"
   },
   {
     "cmd": [],
@@ -6014,7 +6014,7 @@
       "1024",
       "-C",
       "[CACHE]\\builder\\src\\out/android_release",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -6054,7 +6054,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build android_release gen_snapshot"
+    "name": "build android_release flutter:gen_snapshot"
   },
   {
     "cmd": [],
@@ -6473,7 +6473,7 @@
       "1024",
       "-C",
       "[CACHE]\\builder\\src\\out/android_release_arm64",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -6513,7 +6513,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build android_release_arm64 gen_snapshot"
+    "name": "build android_release_arm64 flutter:gen_snapshot"
   },
   {
     "cmd": [],
@@ -6932,7 +6932,7 @@
       "1024",
       "-C",
       "[CACHE]\\builder\\src\\out/android_release_x64",
-      "gen_snapshot"
+      "flutter:gen_snapshot"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -6972,7 +6972,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build android_release_x64 gen_snapshot"
+    "name": "build android_release_x64 flutter:gen_snapshot"
   },
   {
     "cmd": [],
diff --git a/recipes/engine/engine.py b/recipes/engine/engine.py
index af2552a..9ed0144 100644
--- a/recipes/engine/engine.py
+++ b/recipes/engine/engine.py
@@ -1511,9 +1511,9 @@
     Build(api, 'host_debug')
     RunTests(api, 'host_debug', types='engine')
     RunGN(api, '--runtime-mode', 'profile', '--no-lto', '--prebuilt-dart-sdk')
-    Build(api, 'host_profile', 'windows', 'gen_snapshot')
+    Build(api, 'host_profile', 'windows', 'flutter:gen_snapshot')
     RunGN(api, '--runtime-mode', 'release', '--no-lto', '--prebuilt-dart-sdk')
-    Build(api, 'host_release', 'windows', 'gen_snapshot')
+    Build(api, 'host_release', 'windows', 'flutter:gen_snapshot')
     if BuildFontSubset(api):
       Build(api, 'host_release', 'flutter/tools/font-subset')
 
@@ -1576,12 +1576,12 @@
     RunGN(api, '--runtime-mode', 'release', '--android')
     RunGN(api, '--runtime-mode', 'release', '--android', '--android-cpu=arm64')
     RunGN(api, '--runtime-mode', 'release', '--android', '--android-cpu=x64')
-    Build(api, 'android_profile', 'gen_snapshot')
-    Build(api, 'android_profile_arm64', 'gen_snapshot')
-    Build(api, 'android_profile_x64', 'gen_snapshot')
-    Build(api, 'android_release', 'gen_snapshot')
-    Build(api, 'android_release_arm64', 'gen_snapshot')
-    Build(api, 'android_release_x64', 'gen_snapshot')
+    Build(api, 'android_profile', 'flutter:gen_snapshot')
+    Build(api, 'android_profile_arm64', 'flutter:gen_snapshot')
+    Build(api, 'android_profile_x64', 'flutter:gen_snapshot')
+    Build(api, 'android_release', 'flutter:gen_snapshot')
+    Build(api, 'android_release_arm64', 'flutter:gen_snapshot')
+    Build(api, 'android_release_x64', 'flutter:gen_snapshot')
     UploadArtifacts(
         api,
         "android-arm-profile", [