Save to the new bucket location only.

This is to stop saving release artifacts to the old bucket location and
finalize the bucket migration to flutter-infra project.

Change-Id: I0eda70de7eed57c53f8a681882e95207c0c91516
Bug: https://github.com/flutter/flutter/issues/75363
Reviewed-on: https://flutter-review.googlesource.com/c/recipes/+/13882
Reviewed-by: Christopher Fujino <fujino@google.com>
Commit-Queue: Godofredo Contreras <godofredoc@google.com>
diff --git a/recipes/engine.expected/Linux Fuchsia failing test.json b/recipes/engine.expected/Linux Fuchsia failing test.json
index e87d3e7..04d564f 100644
--- a/recipes/engine.expected/Linux Fuchsia failing test.json
+++ b/recipes/engine.expected/Linux Fuchsia failing test.json
@@ -12662,43 +12662,6 @@
       "cp",
       "-r",
       "[CLEANUP]/tmp_tmp_30/sizes",
-      "gs://flutter_infra/flutter/2d72510e447ab60a9728aeea2362d8be2cbd7789/android-arm64-release"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "GOMA_DIR": "[CACHE]/goma/client"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "name": "gsutil upload treemap for out/android_release_arm64/libflutter.so",
-    "~followup_annotations": [
-      "@@@STEP_LINK@Open Treemap@https://storage.googleapis.com/flutter_infra/flutter/2d72510e447ab60a9728aeea2362d8be2cbd7789/android-arm64-release/sizes/index.html@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
-      "--",
-      "RECIPE_REPO[depot_tools]/gsutil.py",
-      "----",
-      "cp",
-      "-r",
-      "[CLEANUP]/tmp_tmp_30/sizes",
       "gs://flutter_infra_release/flutter/2d72510e447ab60a9728aeea2362d8be2cbd7789/android-arm64-release"
     ],
     "cwd": "[CACHE]/builder",
@@ -12720,7 +12683,7 @@
       ]
     },
     "infra_step": true,
-    "name": "gsutil upload treemap for out/android_release_arm64/libflutter.so (2)",
+    "name": "gsutil upload treemap for out/android_release_arm64/libflutter.so",
     "~followup_annotations": [
       "@@@STEP_LINK@Open Treemap@https://storage.googleapis.com/flutter_infra_release/flutter/2d72510e447ab60a9728aeea2362d8be2cbd7789/android-arm64-release/sizes/index.html@@@"
     ]
@@ -15098,43 +15061,6 @@
       "cp",
       "-r",
       "[CLEANUP]/tmp_tmp_37/sizes",
-      "gs://flutter_infra/flutter/2d72510e447ab60a9728aeea2362d8be2cbd7789/android-arm-release"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "GOMA_DIR": "[CACHE]/goma/client"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "name": "gsutil upload treemap for out/android_release/libflutter.so",
-    "~followup_annotations": [
-      "@@@STEP_LINK@Open Treemap@https://storage.googleapis.com/flutter_infra/flutter/2d72510e447ab60a9728aeea2362d8be2cbd7789/android-arm-release/sizes/index.html@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
-      "--",
-      "RECIPE_REPO[depot_tools]/gsutil.py",
-      "----",
-      "cp",
-      "-r",
-      "[CLEANUP]/tmp_tmp_37/sizes",
       "gs://flutter_infra_release/flutter/2d72510e447ab60a9728aeea2362d8be2cbd7789/android-arm-release"
     ],
     "cwd": "[CACHE]/builder",
@@ -15156,7 +15082,7 @@
       ]
     },
     "infra_step": true,
-    "name": "gsutil upload treemap for out/android_release/libflutter.so (2)",
+    "name": "gsutil upload treemap for out/android_release/libflutter.so",
     "~followup_annotations": [
       "@@@STEP_LINK@Open Treemap@https://storage.googleapis.com/flutter_infra_release/flutter/2d72510e447ab60a9728aeea2362d8be2cbd7789/android-arm-release/sizes/index.html@@@"
     ]
diff --git a/recipes/engine.expected/Linux Fuchsia skips on duplicate.json b/recipes/engine.expected/Linux Fuchsia skips on duplicate.json
index 667f685..08c8986 100644
--- a/recipes/engine.expected/Linux Fuchsia skips on duplicate.json
+++ b/recipes/engine.expected/Linux Fuchsia skips on duplicate.json
@@ -12878,43 +12878,6 @@
       "cp",
       "-r",
       "[CLEANUP]/tmp_tmp_30/sizes",
-      "gs://flutter_infra/flutter/abcd1234/android-arm64-release"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "GOMA_DIR": "[CACHE]/goma/client"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "name": "gsutil upload treemap for out/android_release_arm64/libflutter.so",
-    "~followup_annotations": [
-      "@@@STEP_LINK@Open Treemap@https://storage.googleapis.com/flutter_infra/flutter/abcd1234/android-arm64-release/sizes/index.html@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
-      "--",
-      "RECIPE_REPO[depot_tools]/gsutil.py",
-      "----",
-      "cp",
-      "-r",
-      "[CLEANUP]/tmp_tmp_30/sizes",
       "gs://flutter_infra_release/flutter/abcd1234/android-arm64-release"
     ],
     "cwd": "[CACHE]/builder",
@@ -12936,7 +12899,7 @@
       ]
     },
     "infra_step": true,
-    "name": "gsutil upload treemap for out/android_release_arm64/libflutter.so (2)",
+    "name": "gsutil upload treemap for out/android_release_arm64/libflutter.so",
     "~followup_annotations": [
       "@@@STEP_LINK@Open Treemap@https://storage.googleapis.com/flutter_infra_release/flutter/abcd1234/android-arm64-release/sizes/index.html@@@"
     ]
@@ -15332,43 +15295,6 @@
       "cp",
       "-r",
       "[CLEANUP]/tmp_tmp_37/sizes",
-      "gs://flutter_infra/flutter/abcd1234/android-arm-release"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "GOMA_DIR": "[CACHE]/goma/client"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "name": "gsutil upload treemap for out/android_release/libflutter.so",
-    "~followup_annotations": [
-      "@@@STEP_LINK@Open Treemap@https://storage.googleapis.com/flutter_infra/flutter/abcd1234/android-arm-release/sizes/index.html@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
-      "--",
-      "RECIPE_REPO[depot_tools]/gsutil.py",
-      "----",
-      "cp",
-      "-r",
-      "[CLEANUP]/tmp_tmp_37/sizes",
       "gs://flutter_infra_release/flutter/abcd1234/android-arm-release"
     ],
     "cwd": "[CACHE]/builder",
@@ -15390,7 +15316,7 @@
       ]
     },
     "infra_step": true,
-    "name": "gsutil upload treemap for out/android_release/libflutter.so (2)",
+    "name": "gsutil upload treemap for out/android_release/libflutter.so",
     "~followup_annotations": [
       "@@@STEP_LINK@Open Treemap@https://storage.googleapis.com/flutter_infra_release/flutter/abcd1234/android-arm-release/sizes/index.html@@@"
     ]
diff --git a/recipes/engine.expected/experimental_upload.json b/recipes/engine.expected/experimental_upload.json
index 442cb65..f2cbec2 100644
--- a/recipes/engine.expected/experimental_upload.json
+++ b/recipes/engine.expected/experimental_upload.json
@@ -12662,43 +12662,6 @@
       "cp",
       "-r",
       "[CLEANUP]/tmp_tmp_30/sizes",
-      "gs://flutter_infra/flutter/experimental/2d72510e447ab60a9728aeea2362d8be2cbd7789/android-arm64-release"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "GOMA_DIR": "[CACHE]/goma/client"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "name": "gsutil upload treemap for out/android_release_arm64/libflutter.so",
-    "~followup_annotations": [
-      "@@@STEP_LINK@Open Treemap@https://storage.googleapis.com/flutter_infra/flutter/experimental/2d72510e447ab60a9728aeea2362d8be2cbd7789/android-arm64-release/sizes/index.html@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
-      "--",
-      "RECIPE_REPO[depot_tools]/gsutil.py",
-      "----",
-      "cp",
-      "-r",
-      "[CLEANUP]/tmp_tmp_30/sizes",
       "gs://flutter_infra_release/flutter/experimental/2d72510e447ab60a9728aeea2362d8be2cbd7789/android-arm64-release"
     ],
     "cwd": "[CACHE]/builder",
@@ -12720,7 +12683,7 @@
       ]
     },
     "infra_step": true,
-    "name": "gsutil upload treemap for out/android_release_arm64/libflutter.so (2)",
+    "name": "gsutil upload treemap for out/android_release_arm64/libflutter.so",
     "~followup_annotations": [
       "@@@STEP_LINK@Open Treemap@https://storage.googleapis.com/flutter_infra_release/flutter/experimental/2d72510e447ab60a9728aeea2362d8be2cbd7789/android-arm64-release/sizes/index.html@@@"
     ]
@@ -15098,43 +15061,6 @@
       "cp",
       "-r",
       "[CLEANUP]/tmp_tmp_37/sizes",
-      "gs://flutter_infra/flutter/experimental/2d72510e447ab60a9728aeea2362d8be2cbd7789/android-arm-release"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "GOMA_DIR": "[CACHE]/goma/client"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "name": "gsutil upload treemap for out/android_release/libflutter.so",
-    "~followup_annotations": [
-      "@@@STEP_LINK@Open Treemap@https://storage.googleapis.com/flutter_infra/flutter/experimental/2d72510e447ab60a9728aeea2362d8be2cbd7789/android-arm-release/sizes/index.html@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
-      "--",
-      "RECIPE_REPO[depot_tools]/gsutil.py",
-      "----",
-      "cp",
-      "-r",
-      "[CLEANUP]/tmp_tmp_37/sizes",
       "gs://flutter_infra_release/flutter/experimental/2d72510e447ab60a9728aeea2362d8be2cbd7789/android-arm-release"
     ],
     "cwd": "[CACHE]/builder",
@@ -15156,7 +15082,7 @@
       ]
     },
     "infra_step": true,
-    "name": "gsutil upload treemap for out/android_release/libflutter.so (2)",
+    "name": "gsutil upload treemap for out/android_release/libflutter.so",
     "~followup_annotations": [
       "@@@STEP_LINK@Open Treemap@https://storage.googleapis.com/flutter_infra_release/flutter/experimental/2d72510e447ab60a9728aeea2362d8be2cbd7789/android-arm-release/sizes/index.html@@@"
     ]
diff --git a/recipes/engine.expected/linux_upload.json b/recipes/engine.expected/linux_upload.json
index 46ba241..a2809c4 100644
--- a/recipes/engine.expected/linux_upload.json
+++ b/recipes/engine.expected/linux_upload.json
@@ -12662,43 +12662,6 @@
       "cp",
       "-r",
       "[CLEANUP]/tmp_tmp_30/sizes",
-      "gs://flutter_infra/flutter/abcd1234/android-arm64-release"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "GOMA_DIR": "[CACHE]/goma/client"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "name": "gsutil upload treemap for out/android_release_arm64/libflutter.so",
-    "~followup_annotations": [
-      "@@@STEP_LINK@Open Treemap@https://storage.googleapis.com/flutter_infra/flutter/abcd1234/android-arm64-release/sizes/index.html@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
-      "--",
-      "RECIPE_REPO[depot_tools]/gsutil.py",
-      "----",
-      "cp",
-      "-r",
-      "[CLEANUP]/tmp_tmp_30/sizes",
       "gs://flutter_infra_release/flutter/abcd1234/android-arm64-release"
     ],
     "cwd": "[CACHE]/builder",
@@ -12720,7 +12683,7 @@
       ]
     },
     "infra_step": true,
-    "name": "gsutil upload treemap for out/android_release_arm64/libflutter.so (2)",
+    "name": "gsutil upload treemap for out/android_release_arm64/libflutter.so",
     "~followup_annotations": [
       "@@@STEP_LINK@Open Treemap@https://storage.googleapis.com/flutter_infra_release/flutter/abcd1234/android-arm64-release/sizes/index.html@@@"
     ]
@@ -15098,43 +15061,6 @@
       "cp",
       "-r",
       "[CLEANUP]/tmp_tmp_37/sizes",
-      "gs://flutter_infra/flutter/abcd1234/android-arm-release"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "GOMA_DIR": "[CACHE]/goma/client"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "name": "gsutil upload treemap for out/android_release/libflutter.so",
-    "~followup_annotations": [
-      "@@@STEP_LINK@Open Treemap@https://storage.googleapis.com/flutter_infra/flutter/abcd1234/android-arm-release/sizes/index.html@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
-      "--",
-      "RECIPE_REPO[depot_tools]/gsutil.py",
-      "----",
-      "cp",
-      "-r",
-      "[CLEANUP]/tmp_tmp_37/sizes",
       "gs://flutter_infra_release/flutter/abcd1234/android-arm-release"
     ],
     "cwd": "[CACHE]/builder",
@@ -15156,7 +15082,7 @@
       ]
     },
     "infra_step": true,
-    "name": "gsutil upload treemap for out/android_release/libflutter.so (2)",
+    "name": "gsutil upload treemap for out/android_release/libflutter.so",
     "~followup_annotations": [
       "@@@STEP_LINK@Open Treemap@https://storage.googleapis.com/flutter_infra_release/flutter/abcd1234/android-arm-release/sizes/index.html@@@"
     ]
diff --git a/recipes/engine.expected/linux_upload_maven_or_bitcode.json b/recipes/engine.expected/linux_upload_maven_or_bitcode.json
index a391694..3e0d6ff 100644
--- a/recipes/engine.expected/linux_upload_maven_or_bitcode.json
+++ b/recipes/engine.expected/linux_upload_maven_or_bitcode.json
@@ -12122,43 +12122,6 @@
       "cp",
       "-r",
       "[CLEANUP]/tmp_tmp_30/sizes",
-      "gs://flutter_infra/flutter/abcd1234/android-arm64-release"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "GOMA_DIR": "[CACHE]/goma/client"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "name": "gsutil upload treemap for out/android_release_arm64/libflutter.so",
-    "~followup_annotations": [
-      "@@@STEP_LINK@Open Treemap@https://storage.googleapis.com/flutter_infra/flutter/abcd1234/android-arm64-release/sizes/index.html@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
-      "--",
-      "RECIPE_REPO[depot_tools]/gsutil.py",
-      "----",
-      "cp",
-      "-r",
-      "[CLEANUP]/tmp_tmp_30/sizes",
       "gs://flutter_infra_release/flutter/abcd1234/android-arm64-release"
     ],
     "cwd": "[CACHE]/builder",
@@ -12180,7 +12143,7 @@
       ]
     },
     "infra_step": true,
-    "name": "gsutil upload treemap for out/android_release_arm64/libflutter.so (2)",
+    "name": "gsutil upload treemap for out/android_release_arm64/libflutter.so",
     "~followup_annotations": [
       "@@@STEP_LINK@Open Treemap@https://storage.googleapis.com/flutter_infra_release/flutter/abcd1234/android-arm64-release/sizes/index.html@@@"
     ]
@@ -14414,43 +14377,6 @@
       "cp",
       "-r",
       "[CLEANUP]/tmp_tmp_37/sizes",
-      "gs://flutter_infra/flutter/abcd1234/android-arm-release"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "GOMA_DIR": "[CACHE]/goma/client"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "name": "gsutil upload treemap for out/android_release/libflutter.so",
-    "~followup_annotations": [
-      "@@@STEP_LINK@Open Treemap@https://storage.googleapis.com/flutter_infra/flutter/abcd1234/android-arm-release/sizes/index.html@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
-      "--",
-      "RECIPE_REPO[depot_tools]/gsutil.py",
-      "----",
-      "cp",
-      "-r",
-      "[CLEANUP]/tmp_tmp_37/sizes",
       "gs://flutter_infra_release/flutter/abcd1234/android-arm-release"
     ],
     "cwd": "[CACHE]/builder",
@@ -14472,7 +14398,7 @@
       ]
     },
     "infra_step": true,
-    "name": "gsutil upload treemap for out/android_release/libflutter.so (2)",
+    "name": "gsutil upload treemap for out/android_release/libflutter.so",
     "~followup_annotations": [
       "@@@STEP_LINK@Open Treemap@https://storage.googleapis.com/flutter_infra_release/flutter/abcd1234/android-arm-release/sizes/index.html@@@"
     ]
diff --git a/recipes/engine.expected/linux_upload_maven_or_bitcode_no_lto.json b/recipes/engine.expected/linux_upload_maven_or_bitcode_no_lto.json
index 1b9c424..9b726d5 100644
--- a/recipes/engine.expected/linux_upload_maven_or_bitcode_no_lto.json
+++ b/recipes/engine.expected/linux_upload_maven_or_bitcode_no_lto.json
@@ -12133,43 +12133,6 @@
       "cp",
       "-r",
       "[CLEANUP]/tmp_tmp_30/sizes",
-      "gs://flutter_infra/flutter/abcd1234/android-arm64-release"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "GOMA_DIR": "[CACHE]/goma/client"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "name": "gsutil upload treemap for out/android_release_arm64/libflutter.so",
-    "~followup_annotations": [
-      "@@@STEP_LINK@Open Treemap@https://storage.googleapis.com/flutter_infra/flutter/abcd1234/android-arm64-release/sizes/index.html@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
-      "--",
-      "RECIPE_REPO[depot_tools]/gsutil.py",
-      "----",
-      "cp",
-      "-r",
-      "[CLEANUP]/tmp_tmp_30/sizes",
       "gs://flutter_infra_release/flutter/abcd1234/android-arm64-release"
     ],
     "cwd": "[CACHE]/builder",
@@ -12191,7 +12154,7 @@
       ]
     },
     "infra_step": true,
-    "name": "gsutil upload treemap for out/android_release_arm64/libflutter.so (2)",
+    "name": "gsutil upload treemap for out/android_release_arm64/libflutter.so",
     "~followup_annotations": [
       "@@@STEP_LINK@Open Treemap@https://storage.googleapis.com/flutter_infra_release/flutter/abcd1234/android-arm64-release/sizes/index.html@@@"
     ]
@@ -14427,43 +14390,6 @@
       "cp",
       "-r",
       "[CLEANUP]/tmp_tmp_37/sizes",
-      "gs://flutter_infra/flutter/abcd1234/android-arm-release"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "GOMA_DIR": "[CACHE]/goma/client"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "name": "gsutil upload treemap for out/android_release/libflutter.so",
-    "~followup_annotations": [
-      "@@@STEP_LINK@Open Treemap@https://storage.googleapis.com/flutter_infra/flutter/abcd1234/android-arm-release/sizes/index.html@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
-      "--",
-      "RECIPE_REPO[depot_tools]/gsutil.py",
-      "----",
-      "cp",
-      "-r",
-      "[CLEANUP]/tmp_tmp_37/sizes",
       "gs://flutter_infra_release/flutter/abcd1234/android-arm-release"
     ],
     "cwd": "[CACHE]/builder",
@@ -14485,7 +14411,7 @@
       ]
     },
     "infra_step": true,
-    "name": "gsutil upload treemap for out/android_release/libflutter.so (2)",
+    "name": "gsutil upload treemap for out/android_release/libflutter.so",
     "~followup_annotations": [
       "@@@STEP_LINK@Open Treemap@https://storage.googleapis.com/flutter_infra_release/flutter/abcd1234/android-arm-release/sizes/index.html@@@"
     ]
diff --git a/recipes/engine.expected/linux_upload_maven_or_bitcode_publish_cipd.json b/recipes/engine.expected/linux_upload_maven_or_bitcode_publish_cipd.json
index 82d6b3c..79dbd3e 100644
--- a/recipes/engine.expected/linux_upload_maven_or_bitcode_publish_cipd.json
+++ b/recipes/engine.expected/linux_upload_maven_or_bitcode_publish_cipd.json
@@ -12122,43 +12122,6 @@
       "cp",
       "-r",
       "[CLEANUP]/tmp_tmp_30/sizes",
-      "gs://flutter_infra/flutter/abcd1234/android-arm64-release"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "GOMA_DIR": "[CACHE]/goma/client"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "name": "gsutil upload treemap for out/android_release_arm64/libflutter.so",
-    "~followup_annotations": [
-      "@@@STEP_LINK@Open Treemap@https://storage.googleapis.com/flutter_infra/flutter/abcd1234/android-arm64-release/sizes/index.html@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
-      "--",
-      "RECIPE_REPO[depot_tools]/gsutil.py",
-      "----",
-      "cp",
-      "-r",
-      "[CLEANUP]/tmp_tmp_30/sizes",
       "gs://flutter_infra_release/flutter/abcd1234/android-arm64-release"
     ],
     "cwd": "[CACHE]/builder",
@@ -12180,7 +12143,7 @@
       ]
     },
     "infra_step": true,
-    "name": "gsutil upload treemap for out/android_release_arm64/libflutter.so (2)",
+    "name": "gsutil upload treemap for out/android_release_arm64/libflutter.so",
     "~followup_annotations": [
       "@@@STEP_LINK@Open Treemap@https://storage.googleapis.com/flutter_infra_release/flutter/abcd1234/android-arm64-release/sizes/index.html@@@"
     ]
@@ -14414,43 +14377,6 @@
       "cp",
       "-r",
       "[CLEANUP]/tmp_tmp_37/sizes",
-      "gs://flutter_infra/flutter/abcd1234/android-arm-release"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "GOMA_DIR": "[CACHE]/goma/client"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "name": "gsutil upload treemap for out/android_release/libflutter.so",
-    "~followup_annotations": [
-      "@@@STEP_LINK@Open Treemap@https://storage.googleapis.com/flutter_infra/flutter/abcd1234/android-arm-release/sizes/index.html@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
-      "--",
-      "RECIPE_REPO[depot_tools]/gsutil.py",
-      "----",
-      "cp",
-      "-r",
-      "[CLEANUP]/tmp_tmp_37/sizes",
       "gs://flutter_infra_release/flutter/abcd1234/android-arm-release"
     ],
     "cwd": "[CACHE]/builder",
@@ -14472,7 +14398,7 @@
       ]
     },
     "infra_step": true,
-    "name": "gsutil upload treemap for out/android_release/libflutter.so (2)",
+    "name": "gsutil upload treemap for out/android_release/libflutter.so",
     "~followup_annotations": [
       "@@@STEP_LINK@Open Treemap@https://storage.googleapis.com/flutter_infra_release/flutter/abcd1234/android-arm-release/sizes/index.html@@@"
     ]
diff --git a/recipes/engine.expected/linux_upload_maven_or_bitcode_publish_cipd_no_lto.json b/recipes/engine.expected/linux_upload_maven_or_bitcode_publish_cipd_no_lto.json
index b657526..a56a6f4 100644
--- a/recipes/engine.expected/linux_upload_maven_or_bitcode_publish_cipd_no_lto.json
+++ b/recipes/engine.expected/linux_upload_maven_or_bitcode_publish_cipd_no_lto.json
@@ -12133,43 +12133,6 @@
       "cp",
       "-r",
       "[CLEANUP]/tmp_tmp_30/sizes",
-      "gs://flutter_infra/flutter/abcd1234/android-arm64-release"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "GOMA_DIR": "[CACHE]/goma/client"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "name": "gsutil upload treemap for out/android_release_arm64/libflutter.so",
-    "~followup_annotations": [
-      "@@@STEP_LINK@Open Treemap@https://storage.googleapis.com/flutter_infra/flutter/abcd1234/android-arm64-release/sizes/index.html@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
-      "--",
-      "RECIPE_REPO[depot_tools]/gsutil.py",
-      "----",
-      "cp",
-      "-r",
-      "[CLEANUP]/tmp_tmp_30/sizes",
       "gs://flutter_infra_release/flutter/abcd1234/android-arm64-release"
     ],
     "cwd": "[CACHE]/builder",
@@ -12191,7 +12154,7 @@
       ]
     },
     "infra_step": true,
-    "name": "gsutil upload treemap for out/android_release_arm64/libflutter.so (2)",
+    "name": "gsutil upload treemap for out/android_release_arm64/libflutter.so",
     "~followup_annotations": [
       "@@@STEP_LINK@Open Treemap@https://storage.googleapis.com/flutter_infra_release/flutter/abcd1234/android-arm64-release/sizes/index.html@@@"
     ]
@@ -14427,43 +14390,6 @@
       "cp",
       "-r",
       "[CLEANUP]/tmp_tmp_37/sizes",
-      "gs://flutter_infra/flutter/abcd1234/android-arm-release"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "GOMA_DIR": "[CACHE]/goma/client"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "name": "gsutil upload treemap for out/android_release/libflutter.so",
-    "~followup_annotations": [
-      "@@@STEP_LINK@Open Treemap@https://storage.googleapis.com/flutter_infra/flutter/abcd1234/android-arm-release/sizes/index.html@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
-      "--",
-      "RECIPE_REPO[depot_tools]/gsutil.py",
-      "----",
-      "cp",
-      "-r",
-      "[CLEANUP]/tmp_tmp_37/sizes",
       "gs://flutter_infra_release/flutter/abcd1234/android-arm-release"
     ],
     "cwd": "[CACHE]/builder",
@@ -14485,7 +14411,7 @@
       ]
     },
     "infra_step": true,
-    "name": "gsutil upload treemap for out/android_release/libflutter.so (2)",
+    "name": "gsutil upload treemap for out/android_release/libflutter.so",
     "~followup_annotations": [
       "@@@STEP_LINK@Open Treemap@https://storage.googleapis.com/flutter_infra_release/flutter/abcd1234/android-arm-release/sizes/index.html@@@"
     ]
diff --git a/recipes/engine.expected/linux_upload_no_lto.json b/recipes/engine.expected/linux_upload_no_lto.json
index abf2a1d..6e7290d 100644
--- a/recipes/engine.expected/linux_upload_no_lto.json
+++ b/recipes/engine.expected/linux_upload_no_lto.json
@@ -12673,43 +12673,6 @@
       "cp",
       "-r",
       "[CLEANUP]/tmp_tmp_30/sizes",
-      "gs://flutter_infra/flutter/abcd1234/android-arm64-release"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "GOMA_DIR": "[CACHE]/goma/client"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "name": "gsutil upload treemap for out/android_release_arm64/libflutter.so",
-    "~followup_annotations": [
-      "@@@STEP_LINK@Open Treemap@https://storage.googleapis.com/flutter_infra/flutter/abcd1234/android-arm64-release/sizes/index.html@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
-      "--",
-      "RECIPE_REPO[depot_tools]/gsutil.py",
-      "----",
-      "cp",
-      "-r",
-      "[CLEANUP]/tmp_tmp_30/sizes",
       "gs://flutter_infra_release/flutter/abcd1234/android-arm64-release"
     ],
     "cwd": "[CACHE]/builder",
@@ -12731,7 +12694,7 @@
       ]
     },
     "infra_step": true,
-    "name": "gsutil upload treemap for out/android_release_arm64/libflutter.so (2)",
+    "name": "gsutil upload treemap for out/android_release_arm64/libflutter.so",
     "~followup_annotations": [
       "@@@STEP_LINK@Open Treemap@https://storage.googleapis.com/flutter_infra_release/flutter/abcd1234/android-arm64-release/sizes/index.html@@@"
     ]
@@ -15111,43 +15074,6 @@
       "cp",
       "-r",
       "[CLEANUP]/tmp_tmp_37/sizes",
-      "gs://flutter_infra/flutter/abcd1234/android-arm-release"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "GOMA_DIR": "[CACHE]/goma/client"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "name": "gsutil upload treemap for out/android_release/libflutter.so",
-    "~followup_annotations": [
-      "@@@STEP_LINK@Open Treemap@https://storage.googleapis.com/flutter_infra/flutter/abcd1234/android-arm-release/sizes/index.html@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
-      "--",
-      "RECIPE_REPO[depot_tools]/gsutil.py",
-      "----",
-      "cp",
-      "-r",
-      "[CLEANUP]/tmp_tmp_37/sizes",
       "gs://flutter_infra_release/flutter/abcd1234/android-arm-release"
     ],
     "cwd": "[CACHE]/builder",
@@ -15169,7 +15095,7 @@
       ]
     },
     "infra_step": true,
-    "name": "gsutil upload treemap for out/android_release/libflutter.so (2)",
+    "name": "gsutil upload treemap for out/android_release/libflutter.so",
     "~followup_annotations": [
       "@@@STEP_LINK@Open Treemap@https://storage.googleapis.com/flutter_infra_release/flutter/abcd1234/android-arm-release/sizes/index.html@@@"
     ]
diff --git a/recipes/engine.expected/linux_upload_publish_cipd.json b/recipes/engine.expected/linux_upload_publish_cipd.json
index 7ffd9f7..8b9fb82 100644
--- a/recipes/engine.expected/linux_upload_publish_cipd.json
+++ b/recipes/engine.expected/linux_upload_publish_cipd.json
@@ -12662,43 +12662,6 @@
       "cp",
       "-r",
       "[CLEANUP]/tmp_tmp_30/sizes",
-      "gs://flutter_infra/flutter/abcd1234/android-arm64-release"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "GOMA_DIR": "[CACHE]/goma/client"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "name": "gsutil upload treemap for out/android_release_arm64/libflutter.so",
-    "~followup_annotations": [
-      "@@@STEP_LINK@Open Treemap@https://storage.googleapis.com/flutter_infra/flutter/abcd1234/android-arm64-release/sizes/index.html@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
-      "--",
-      "RECIPE_REPO[depot_tools]/gsutil.py",
-      "----",
-      "cp",
-      "-r",
-      "[CLEANUP]/tmp_tmp_30/sizes",
       "gs://flutter_infra_release/flutter/abcd1234/android-arm64-release"
     ],
     "cwd": "[CACHE]/builder",
@@ -12720,7 +12683,7 @@
       ]
     },
     "infra_step": true,
-    "name": "gsutil upload treemap for out/android_release_arm64/libflutter.so (2)",
+    "name": "gsutil upload treemap for out/android_release_arm64/libflutter.so",
     "~followup_annotations": [
       "@@@STEP_LINK@Open Treemap@https://storage.googleapis.com/flutter_infra_release/flutter/abcd1234/android-arm64-release/sizes/index.html@@@"
     ]
@@ -15098,43 +15061,6 @@
       "cp",
       "-r",
       "[CLEANUP]/tmp_tmp_37/sizes",
-      "gs://flutter_infra/flutter/abcd1234/android-arm-release"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "GOMA_DIR": "[CACHE]/goma/client"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "name": "gsutil upload treemap for out/android_release/libflutter.so",
-    "~followup_annotations": [
-      "@@@STEP_LINK@Open Treemap@https://storage.googleapis.com/flutter_infra/flutter/abcd1234/android-arm-release/sizes/index.html@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
-      "--",
-      "RECIPE_REPO[depot_tools]/gsutil.py",
-      "----",
-      "cp",
-      "-r",
-      "[CLEANUP]/tmp_tmp_37/sizes",
       "gs://flutter_infra_release/flutter/abcd1234/android-arm-release"
     ],
     "cwd": "[CACHE]/builder",
@@ -15156,7 +15082,7 @@
       ]
     },
     "infra_step": true,
-    "name": "gsutil upload treemap for out/android_release/libflutter.so (2)",
+    "name": "gsutil upload treemap for out/android_release/libflutter.so",
     "~followup_annotations": [
       "@@@STEP_LINK@Open Treemap@https://storage.googleapis.com/flutter_infra_release/flutter/abcd1234/android-arm-release/sizes/index.html@@@"
     ]
diff --git a/recipes/engine.expected/linux_upload_publish_cipd_no_lto.json b/recipes/engine.expected/linux_upload_publish_cipd_no_lto.json
index 097dae3..109e32e 100644
--- a/recipes/engine.expected/linux_upload_publish_cipd_no_lto.json
+++ b/recipes/engine.expected/linux_upload_publish_cipd_no_lto.json
@@ -12673,43 +12673,6 @@
       "cp",
       "-r",
       "[CLEANUP]/tmp_tmp_30/sizes",
-      "gs://flutter_infra/flutter/abcd1234/android-arm64-release"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "GOMA_DIR": "[CACHE]/goma/client"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "name": "gsutil upload treemap for out/android_release_arm64/libflutter.so",
-    "~followup_annotations": [
-      "@@@STEP_LINK@Open Treemap@https://storage.googleapis.com/flutter_infra/flutter/abcd1234/android-arm64-release/sizes/index.html@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
-      "--",
-      "RECIPE_REPO[depot_tools]/gsutil.py",
-      "----",
-      "cp",
-      "-r",
-      "[CLEANUP]/tmp_tmp_30/sizes",
       "gs://flutter_infra_release/flutter/abcd1234/android-arm64-release"
     ],
     "cwd": "[CACHE]/builder",
@@ -12731,7 +12694,7 @@
       ]
     },
     "infra_step": true,
-    "name": "gsutil upload treemap for out/android_release_arm64/libflutter.so (2)",
+    "name": "gsutil upload treemap for out/android_release_arm64/libflutter.so",
     "~followup_annotations": [
       "@@@STEP_LINK@Open Treemap@https://storage.googleapis.com/flutter_infra_release/flutter/abcd1234/android-arm64-release/sizes/index.html@@@"
     ]
@@ -15111,43 +15074,6 @@
       "cp",
       "-r",
       "[CLEANUP]/tmp_tmp_37/sizes",
-      "gs://flutter_infra/flutter/abcd1234/android-arm-release"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "GOMA_DIR": "[CACHE]/goma/client"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "name": "gsutil upload treemap for out/android_release/libflutter.so",
-    "~followup_annotations": [
-      "@@@STEP_LINK@Open Treemap@https://storage.googleapis.com/flutter_infra/flutter/abcd1234/android-arm-release/sizes/index.html@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
-      "--",
-      "RECIPE_REPO[depot_tools]/gsutil.py",
-      "----",
-      "cp",
-      "-r",
-      "[CLEANUP]/tmp_tmp_37/sizes",
       "gs://flutter_infra_release/flutter/abcd1234/android-arm-release"
     ],
     "cwd": "[CACHE]/builder",
@@ -15169,7 +15095,7 @@
       ]
     },
     "infra_step": true,
-    "name": "gsutil upload treemap for out/android_release/libflutter.so (2)",
+    "name": "gsutil upload treemap for out/android_release/libflutter.so",
     "~followup_annotations": [
       "@@@STEP_LINK@Open Treemap@https://storage.googleapis.com/flutter_infra_release/flutter/abcd1234/android-arm-release/sizes/index.html@@@"
     ]
diff --git a/recipes/engine.py b/recipes/engine.py
index 42f1cb6..95321b88 100644
--- a/recipes/engine.py
+++ b/recipes/engine.py
@@ -45,8 +45,7 @@
 # Account for ~1 hour queue time when there is a high number of commits.
 DRONE_TIMEOUT_SECS = 7200
 
-OLD_BUCKET_NAME = 'flutter_infra'
-NEW_BUCKET_NAME = 'flutter_infra_release'
+BUCKET_NAME = 'flutter_infra_release'
 MAVEN_BUCKET_NAME = 'download.flutter.io'
 FUCHSIA_ARTIFACTS_BUCKET_NAME = 'fuchsia-artifacts-release'
 FUCHSIA_ARTIFACTS_DEBUG_NAMESPACE = 'debug'
@@ -467,7 +466,7 @@
       # TODO(fujino): create SafeUploadDirectory() wrapper
       result = api.gsutil.upload(
           destination_dir,
-          OLD_BUCKET_NAME,
+          BUCKET_NAME,
           remote_name,
           args=['-r'],
           name='upload treemap for %s' % lib_flutter_path,
@@ -475,19 +474,7 @@
       )
       result.presentation.links['Open Treemap'] = (
           'https://storage.googleapis.com/%s/%s/sizes/index.html' %
-          (OLD_BUCKET_NAME, remote_name)
-      )
-      result = api.gsutil.upload(
-          destination_dir,
-          NEW_BUCKET_NAME,
-          remote_name,
-          args=['-r'],
-          name='upload treemap for %s' % lib_flutter_path,
-          link_name=None
-      )
-      result.presentation.links['Open Treemap'] = (
-          'https://storage.googleapis.com/%s/%s/sizes/index.html' %
-          (NEW_BUCKET_NAME, remote_name)
+          (BUCKET_NAME, remote_name)
       )