Swap remaining non-orchestrator cases

One of the e2etests fails if they are changed.
The build from `aosp-android-latest-release` is missing the flag from aosp/3451951.

Since the swap is not pressing, we can stay on the frozen `aosp-main`
build.  Once the next quarterly release comes out, or we use the CF host
tools from the debian package in tests, we can swap the rest.

Author: cjreynol

base/cvd/cuttlefish/host/commands/cvd/acloud/converter.cpp

@@ -356,7 +356,7 @@ Result<ConvertedAcloudCreateCommand> ConvertAcloudCreate(
         parsed_flags.build_target) {
       auto target = parsed_flags.build_target ? *parsed_flags.build_target : "";
       auto build = parsed_flags.build_id.value_or(
-          parsed_flags.branch.value_or("aosp-main"));
+          parsed_flags.branch.value_or("aosp-android-latest-release"));
       host_dir += (build + target);
     } else {
       given_branch_target_info = CF_EXPECT(GetDefaultBranchBuildTarget("git_"));
@@ -383,7 +383,7 @@ Result<ConvertedAcloudCreateCommand> ConvertAcloudCreate(
       auto target =
           parsed_flags.build_target ? "/" + *parsed_flags.build_target : "";
       auto build = parsed_flags.build_id.value_or(
-          parsed_flags.branch.value_or("aosp-main"));
+          parsed_flags.branch.value_or("aosp-android-latest-release"));
       fetch_request_builder.AddArguments({build + target});
       fetch_command_str += (build + target);
     }
@@ -393,8 +393,8 @@ Result<ConvertedAcloudCreateCommand> ConvertAcloudCreate(
       if (!target.empty()) {
         target = "/" + target;
       }
-      auto build =
-          system_build_id.value_or(system_branch.value_or("aosp-main"));
+      auto build = system_build_id.value_or(
+          system_branch.value_or("aosp-android-latest-release"));
       fetch_request_builder.AddArguments({"--system_build", build + target});
       fetch_command_str += " --system_build=" + build + target;
     }
@@ -414,7 +414,8 @@ Result<ConvertedAcloudCreateCommand> ConvertAcloudCreate(
       if (!target.empty()) {
         target = "/" + target;
       }
-      auto build = boot_build_id.value_or(boot_branch.value_or("aosp-main"));
+      auto build = boot_build_id.value_or(
+          boot_branch.value_or("aosp-android-latest-release"));
       fetch_request_builder.AddArguments({"--boot_build", build + target});
       fetch_command_str += " --boot_build=" + build + target;
     }

base/cvd/cuttlefish/host/commands/cvd/unittests/fetch/fetch_cvd_parser_test.cpp

@@ -30,7 +30,8 @@ using testing::Eq;
 
 inline constexpr char kTargetDirectory[] = "--target_directory=/tmp/fetch_test";
 inline constexpr char kDefaultBuild[] =
-    "--default_build=aosp-main/aosp_cf_x86_64_phone-trunk_staging-userdebug";
+    "--default_build=aosp-android-latest-release/"
+    "aosp_cf_x86_64_only_phone-userdebug";
 inline constexpr char kCasDownloaderPath[] =
     "--cas_downloader_path=/tmp/casdownloader";
 inline constexpr char kCasCacheDir[] = "--cas_cache_dir=/tmp/cas_cache";

staging/host/cvd_test_configs/local_tests/local_mixed_3_fetch_host.json

@@ -1,6 +1,6 @@
 {
   "common": {
-    "host_package": "@ab/aosp-main"
+    "host_package": "@ab/aosp-android-latest-release"
   },
   "instances": [
     {

staging/host/cvd_test_configs/main_phone.json

@@ -1,6 +1,6 @@
 {
   "common": {
-    "host_package": "@ab/aosp-main/aosp_cf_x86_64_phone-trunk_staging-userdebug"
+    "host_package": "@ab/aosp-android-latest-release/aosp_cf_x86_64_only_phone-userdebug"
   },
   "instances": [
     {

staging/host/cvd_test_configs/tm_phone-tm_watch-main_host_pkg.json

@@ -1,6 +1,6 @@
 {
   "common": {
-    "host_package": "@ab/aosp-main/aosp_cf_x86_64_phone-trunk_staging-userdebug"
+    "host_package": "@ab/aosp-android-latest-release/aosp_cf_x86_64_only_phone-userdebug"
   },
   "instances": [
     {

staging/host/cvd_test_configs/validation_failures/field_name_error.json

@@ -1,6 +1,6 @@
 {
   "common": {
-    "host_package": "@ab/aosp-main/aosp_cf_x86_64_phone-trunk_staging-userdebug"
+    "host_package": "@ab/aosp-android-latest-release/aosp_cf_x86_64_only_phone-userdebug"
   },
   "instances": [
     {

staging/host/cvd_test_configs/validation_failures/type_error.json

@@ -1,6 +1,6 @@
 {
   "common": {
-    "host_package": "@ab/aosp-main/aosp_cf_x86_64_phone-trunk_staging-userdebug"
+    "host_package": "@ab/aosp-android-latest-release/aosp_cf_x86_64_only_phone-userdebug"
   },
   "instances": [
     {