Fix android recipe build upload names

scripts/slave/recipe_modules/auto_bisect/example.expected/android_arm64_bisector.json

 [
   {
     "cmd": [
       "git",
       "update-ref",
       "refs/heads/master",
       "refs/remotes/origin/master"
     ],
     "cwd": "[TMP_BASE]/fake_checkout_tmp_1",
     "name": "git update-ref"
@@ skipping 149 matching lines @@
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
       "--",
       "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
       "----",
       "ls",
-      "gs://chrome-perf/android_perf_rel_arm64/full-build-linux_a6298e4afedbf2cd461755ea6f45b0ad64222222.zip"
+      "gs://chrome-perf/Android arm64 Builder/full-build-linux_a6298e4afedbf2cd461755ea6f45b0ad64222222.zip"
     ],
     "name": "gsutil ls"
   },
   {
     "cmd": [
       "/opt/infra-tools/buildbucket",
       "put",
       "--host",
       "cr-buildbucket.appspot.com",
       "--service-account-json",
       "/creds/service_accounts/service-account-chromium-bisect.json",
-      "{\"bucket\": \"master.tryserver.chromium.perf\", \"client_operation_id\": \"dummy\", \"parameters_json\": \"{\\\"builder_name\\\": \\\"android_arm64_perf_bisect_builder\\\", \\\"properties\\\": {\\\"build_archive_url\\\": \\\"gs://chrome-perf/android_perf_rel_arm64/full-build-linux_a6298e4afedbf2cd461755ea6f45b0ad64222222.zip\\\", \\\"clobber\\\": true, \\\"parent_got_revision\\\": \\\"a6298e4afedbf2cd461755ea6f45b0ad64222222\\\"}}\", \"tags\": [\"builder:android_arm64_perf_bisect_builder\", \"master:tryserver.chromium.perf\", \"user_agent:recipe\"]}"
+      "{\"bucket\": \"master.tryserver.chromium.perf\", \"client_operation_id\": \"dummy\", \"parameters_json\": \"{\\\"builder_name\\\": \\\"android_arm64_perf_bisect_builder\\\", \\\"properties\\\": {\\\"build_archive_url\\\": \\\"gs://chrome-perf/Android arm64 Builder/full-build-linux_a6298e4afedbf2cd461755ea6f45b0ad64222222.zip\\\", \\\"clobber\\\": true, \\\"parent_got_revision\\\": \\\"a6298e4afedbf2cd461755ea6f45b0ad64222222\\\"}}\", \"tags\": [\"builder:android_arm64_perf_bisect_builder\", \"master:tryserver.chromium.perf\", \"user_agent:recipe\"]}"
     ],
     "name": "buildbucket.put",
     "stdout": "/path/to/tmp/json",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output@{@@@",
       "@@@STEP_LOG_LINE@json.output@  \"results\": [@@@",
       "@@@STEP_LOG_LINE@json.output@    {@@@",
       "@@@STEP_LOG_LINE@json.output@      \"build\": {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"id\": \"1201331270\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    }@@@",
       "@@@STEP_LOG_LINE@json.output@  ]@@@",
       "@@@STEP_LOG_LINE@json.output@}@@@",
       "@@@STEP_LOG_END@json.output@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
       "--",
       "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
       "----",
       "ls",
-      "gs://chrome-perf/android_perf_rel_arm64/full-build-linux_00316c9ddfb9d7b4e1ed2fff9fe6d964d2111111.zip"
+      "gs://chrome-perf/Android arm64 Builder/full-build-linux_00316c9ddfb9d7b4e1ed2fff9fe6d964d2111111.zip"
     ],
     "name": "gsutil ls (2)"
   },
   {
     "cmd": [
       "/opt/infra-tools/buildbucket",
       "put",
       "--host",
       "cr-buildbucket.appspot.com",
       "--service-account-json",
       "/creds/service_accounts/service-account-chromium-bisect.json",
-      "{\"bucket\": \"master.tryserver.chromium.perf\", \"client_operation_id\": \"dummy\", \"parameters_json\": \"{\\\"builder_name\\\": \\\"android_arm64_perf_bisect_builder\\\", \\\"properties\\\": {\\\"build_archive_url\\\": \\\"gs://chrome-perf/android_perf_rel_arm64/full-build-linux_00316c9ddfb9d7b4e1ed2fff9fe6d964d2111111.zip\\\", \\\"clobber\\\": true, \\\"parent_got_revision\\\": \\\"00316c9ddfb9d7b4e1ed2fff9fe6d964d2111111\\\"}}\", \"tags\": [\"builder:android_arm64_perf_bisect_builder\", \"master:tryserver.chromium.perf\", \"user_agent:recipe\"]}"
+      "{\"bucket\": \"master.tryserver.chromium.perf\", \"client_operation_id\": \"dummy\", \"parameters_json\": \"{\\\"builder_name\\\": \\\"android_arm64_perf_bisect_builder\\\", \\\"properties\\\": {\\\"build_archive_url\\\": \\\"gs://chrome-perf/Android arm64 Builder/full-build-linux_00316c9ddfb9d7b4e1ed2fff9fe6d964d2111111.zip\\\", \\\"clobber\\\": true, \\\"parent_got_revision\\\": \\\"00316c9ddfb9d7b4e1ed2fff9fe6d964d2111111\\\"}}\", \"tags\": [\"builder:android_arm64_perf_bisect_builder\", \"master:tryserver.chromium.perf\", \"user_agent:recipe\"]}"
     ],
     "name": "buildbucket.put (2)",
     "stdout": "/path/to/tmp/json",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output@{@@@",
       "@@@STEP_LOG_LINE@json.output@  \"results\": [@@@",
       "@@@STEP_LOG_LINE@json.output@    {@@@",
       "@@@STEP_LOG_LINE@json.output@      \"build\": {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"id\": \"1201331270\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    }@@@",
       "@@@STEP_LOG_LINE@json.output@  ]@@@",
       "@@@STEP_LOG_LINE@json.output@}@@@",
       "@@@STEP_LOG_END@json.output@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
       "--",
       "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
       "----",
       "ls",
-      "gs://chrome-perf/android_perf_rel_arm64/full-build-linux_a6298e4afedbf2cd461755ea6f45b0ad64222222.zip"
+      "gs://chrome-perf/Android arm64 Builder/full-build-linux_a6298e4afedbf2cd461755ea6f45b0ad64222222.zip"
     ],
     "name": "gsutil ls (3)"
   },
   {
     "cmd": [],
     "name": "Triggering test job for a6298e4afedbf2cd461755ea6f45b0ad64222222",
     "trigger_specs": [
       {
         "builder_name": "android-nexus9",
         "properties": {
           "bisect_config": {
             "command": "src/tools/perf/run_benchmark -v --browser=android-chromium smoothness.tough_scrolling_cases",
             "metric": "mean_input_event_latency/mean_input_event_latency",
             "repeat_count": 5,
             "test_type": "perf"
           },
           "job_name": "a6298e4afedbf2cd461755ea6f45b0ad64222222-test",
-          "parent_build_archive_url": "gs://chrome-perf/android_perf_rel_arm64/full-build-linux_a6298e4afedbf2cd461755ea6f45b0ad64222222.zip",
+          "parent_build_archive_url": "gs://chrome-perf/Android arm64 Builder/full-build-linux_a6298e4afedbf2cd461755ea6f45b0ad64222222.zip",
           "parent_got_revision": "a6298e4afedbf2cd461755ea6f45b0ad64222222",
           "revision": "a6298e4afedbf2cd461755ea6f45b0ad64222222",
           "revision_ladder": {
             "chromium": "a6298e4afedbf2cd461755ea6f45b0ad64222222"
           }
         }
       }
     ]
   },
   {
@@ skipping 41 matching lines @@
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
       "--",
       "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
       "----",
       "ls",
-      "gs://chrome-perf/android_perf_rel_arm64/full-build-linux_00316c9ddfb9d7b4e1ed2fff9fe6d964d2111111.zip"
+      "gs://chrome-perf/Android arm64 Builder/full-build-linux_00316c9ddfb9d7b4e1ed2fff9fe6d964d2111111.zip"
     ],
     "name": "gsutil ls (5)"
   },
   {
     "cmd": [],
     "name": "Triggering test job for 00316c9ddfb9d7b4e1ed2fff9fe6d964d2111111",
     "trigger_specs": [
       {
         "builder_name": "android-nexus9",
         "properties": {
           "bisect_config": {
             "command": "src/tools/perf/run_benchmark -v --browser=android-chromium smoothness.tough_scrolling_cases",
             "metric": "mean_input_event_latency/mean_input_event_latency",
             "repeat_count": 5,
             "test_type": "perf"
           },
           "job_name": "00316c9ddfb9d7b4e1ed2fff9fe6d964d2111111-test",
-          "parent_build_archive_url": "gs://chrome-perf/android_perf_rel_arm64/full-build-linux_00316c9ddfb9d7b4e1ed2fff9fe6d964d2111111.zip",
+          "parent_build_archive_url": "gs://chrome-perf/Android arm64 Builder/full-build-linux_00316c9ddfb9d7b4e1ed2fff9fe6d964d2111111.zip",
           "parent_got_revision": "00316c9ddfb9d7b4e1ed2fff9fe6d964d2111111",
           "revision": "00316c9ddfb9d7b4e1ed2fff9fe6d964d2111111",
           "revision_ladder": {
             "chromium": "00316c9ddfb9d7b4e1ed2fff9fe6d964d2111111"
           }
         }
       }
     ]
   },
   {
@@ skipping 41 matching lines @@
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
       "--",
       "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
       "----",
       "ls",
-      "gs://chrome-perf/android_perf_rel_arm64/full-build-linux_dcdcdc0ff1122212323134879ddceeb1240b0988.zip"
+      "gs://chrome-perf/Android arm64 Builder/full-build-linux_dcdcdc0ff1122212323134879ddceeb1240b0988.zip"
     ],
     "name": "gsutil ls (7)"
   },
   {
     "cmd": [
       "/opt/infra-tools/buildbucket",
       "put",
       "--host",
       "cr-buildbucket.appspot.com",
       "--service-account-json",
       "/creds/service_accounts/service-account-chromium-bisect.json",
-      "{\"bucket\": \"master.tryserver.chromium.perf\", \"client_operation_id\": \"dummy\", \"parameters_json\": \"{\\\"builder_name\\\": \\\"android_arm64_perf_bisect_builder\\\", \\\"properties\\\": {\\\"build_archive_url\\\": \\\"gs://chrome-perf/android_perf_rel_arm64/full-build-linux_dcdcdc0ff1122212323134879ddceeb1240b0988.zip\\\", \\\"clobber\\\": true, \\\"parent_got_revision\\\": \\\"dcdcdc0ff1122212323134879ddceeb1240b0988\\\"}}\", \"tags\": [\"builder:android_arm64_perf_bisect_builder\", \"master:tryserver.chromium.perf\", \"user_agent:recipe\"]}"
+      "{\"bucket\": \"master.tryserver.chromium.perf\", \"client_operation_id\": \"dummy\", \"parameters_json\": \"{\\\"builder_name\\\": \\\"android_arm64_perf_bisect_builder\\\", \\\"properties\\\": {\\\"build_archive_url\\\": \\\"gs://chrome-perf/Android arm64 Builder/full-build-linux_dcdcdc0ff1122212323134879ddceeb1240b0988.zip\\\", \\\"clobber\\\": true, \\\"parent_got_revision\\\": \\\"dcdcdc0ff1122212323134879ddceeb1240b0988\\\"}}\", \"tags\": [\"builder:android_arm64_perf_bisect_builder\", \"master:tryserver.chromium.perf\", \"user_agent:recipe\"]}"
     ],
     "name": "buildbucket.put (3)",
     "stdout": "/path/to/tmp/json",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output@{@@@",
       "@@@STEP_LOG_LINE@json.output@  \"results\": [@@@",
       "@@@STEP_LOG_LINE@json.output@    {@@@",
       "@@@STEP_LOG_LINE@json.output@      \"build\": {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"id\": \"1201331270\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    }@@@",
       "@@@STEP_LOG_LINE@json.output@  ]@@@",
       "@@@STEP_LOG_LINE@json.output@}@@@",
       "@@@STEP_LOG_END@json.output@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
       "--",
       "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
       "----",
       "ls",
-      "gs://chrome-perf/android_perf_rel_arm64/full-build-linux_dcdcdc0ff1122212323134879ddceeb1240b0988.zip"
+      "gs://chrome-perf/Android arm64 Builder/full-build-linux_dcdcdc0ff1122212323134879ddceeb1240b0988.zip"
     ],
     "name": "gsutil ls (8)"
   },
   {
     "cmd": [],
     "name": "Triggering test job for dcdcdc0ff1122212323134879ddceeb1240b0988",
     "trigger_specs": [
       {
         "builder_name": "android-nexus9",
         "properties": {
           "bisect_config": {
             "command": "src/tools/perf/run_benchmark -v --browser=android-chromium smoothness.tough_scrolling_cases",
             "metric": "mean_input_event_latency/mean_input_event_latency",
             "repeat_count": 5,
             "test_type": "perf"
           },
           "job_name": "dcdcdc0ff1122212323134879ddceeb1240b0988-test",
-          "parent_build_archive_url": "gs://chrome-perf/android_perf_rel_arm64/full-build-linux_dcdcdc0ff1122212323134879ddceeb1240b0988.zip",
+          "parent_build_archive_url": "gs://chrome-perf/Android arm64 Builder/full-build-linux_dcdcdc0ff1122212323134879ddceeb1240b0988.zip",
           "parent_got_revision": "dcdcdc0ff1122212323134879ddceeb1240b0988",
           "revision": "dcdcdc0ff1122212323134879ddceeb1240b0988",
           "revision_ladder": {
             "chromium": "dcdcdc0ff1122212323134879ddceeb1240b0988"
           }
         }
       }
     ]
   },
   {
@@ skipping 203 matching lines @@
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
       "--",
       "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
       "----",
       "ls",
-      "gs://chrome-perf/android_perf_rel_arm64/full-build-linux_a6298e4afedbf2cd461755ea6f45b0ad64222222_51e7ed4b63ad81d8b499e42b888149349afaaca1.zip"
+      "gs://chrome-perf/Android arm64 Builder/full-build-linux_a6298e4afedbf2cd461755ea6f45b0ad64222222_51e7ed4b63ad81d8b499e42b888149349afaaca1.zip"
     ],
     "name": "gsutil ls (10)"
   },
   {
     "cmd": [
       "/opt/infra-tools/buildbucket",
       "put",
       "--host",
       "cr-buildbucket.appspot.com",
       "--service-account-json",
       "/creds/service_accounts/service-account-chromium-bisect.json",
-      "{\"bucket\": \"master.tryserver.chromium.perf\", \"client_operation_id\": \"dummy\", \"parameters_json\": \"{\\\"builder_name\\\": \\\"android_arm64_perf_bisect_builder\\\", \\\"properties\\\": {\\\"build_archive_url\\\": \\\"gs://chrome-perf/android_perf_rel_arm64/full-build-linux_a6298e4afedbf2cd461755ea6f45b0ad64222222_51e7ed4b63ad81d8b499e42b888149349afaaca1.zip\\\", \\\"clobber\\\": true, \\\"deps_revision_overrides\\\": {\\\"src/v8\\\": \\\"003\\\"}, \\\"parent_got_revision\\\": \\\"a6298e4afedbf2cd461755ea6f45b0ad64222222\\\"}}\", \"tags\": [\"builder:android_arm64_perf_bisect_builder\", \"master:tryserver.chromium.perf\", \"user_agent:recipe\"]}"
+      "{\"bucket\": \"master.tryserver.chromium.perf\", \"client_operation_id\": \"dummy\", \"parameters_json\": \"{\\\"builder_name\\\": \\\"android_arm64_perf_bisect_builder\\\", \\\"properties\\\": {\\\"build_archive_url\\\": \\\"gs://chrome-perf/Android arm64 Builder/full-build-linux_a6298e4afedbf2cd461755ea6f45b0ad64222222_51e7ed4b63ad81d8b499e42b888149349afaaca1.zip\\\", \\\"clobber\\\": true, \\\"deps_revision_overrides\\\": {\\\"src/v8\\\": \\\"003\\\"}, \\\"parent_got_revision\\\": \\\"a6298e4afedbf2cd461755ea6f45b0ad64222222\\\"}}\", \"tags\": [\"builder:android_arm64_perf_bisect_builder\", \"master:tryserver.chromium.perf\", \"user_agent:recipe\"]}"
     ],
     "name": "buildbucket.put (4)",
     "stdout": "/path/to/tmp/json",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output@{@@@",
       "@@@STEP_LOG_LINE@json.output@  \"results\": [@@@",
       "@@@STEP_LOG_LINE@json.output@    {@@@",
       "@@@STEP_LOG_LINE@json.output@      \"build\": {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"id\": \"1201331270\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
@@ skipping 301 matching lines @@
       "{\"bisect_config\": {\"bad_revision\": \"314017\", \"bug_id\": \"-1\", \"builder_host\": \"master4.golo.chromium.org\", \"builder_port\": \"8341\", \"bypass_stats_check\": \"True\", \"command\": \"src/tools/perf/run_benchmark -v --browser=android-chromium smoothness.tough_scrolling_cases\", \"dummy_builds\": \"True\", \"dummy_job_names\": \"True\", \"dummy_tests\": \"True\", \"good_revision\": \"314015\", \"gs_bucket\": \"chrome-perf\", \"max_time_minutes\": \"5\", \"metric\": \"mean_input_event_latency/mean_input_event_latency\", \"recipe_tester_name\": \"android-nexus9\", \"repeat_count\": \"2\", \"skip_gclient_ops\": \"True\", \"test_type\": \"perf\"}, \"buildername\": \"linux_perf_bisect\", \"mastername\": \"tryserver.chromium.perf\", \"recipe\": \"auto_bisect:example\", \"slavename\": \"dummyslave\"}"
     ],
     "name": "Running Bisection"
   },
   {
     "name": "$result",
     "recipe_result": null,
     "status_code": 0
   }
 ]