Fix the gpu mode ordering in the non-opt'ing path

google#2502 was incorrect.
The previous behavior was to prefer `--gpu_mode=gfxstream` over
`--gpu_mode=guest_swiftshader` prior to the Jolt changes.

Bug: b/513229182

Author: jmacnak

base/cvd/cuttlefish/host/commands/assemble_cvd/graphics_flags.cc

@@ -456,9 +456,9 @@ std::vector<GpuMode> GetGpuModeCandidates(const GuestConfig& guest_config) {
     gpu_mode_candidates.push_back(GpuMode::GfxstreamGuestAngleHostLavapipe);
     gpu_mode_candidates.push_back(GpuMode::GuestSwiftshader);
   } else {
-    gpu_mode_candidates.push_back(GpuMode::GuestSwiftshader);
     gpu_mode_candidates.push_back(GpuMode::Gfxstream);
     gpu_mode_candidates.push_back(GpuMode::GfxstreamGuestAngle);
+    gpu_mode_candidates.push_back(GpuMode::GuestSwiftshader);
     gpu_mode_candidates.push_back(GpuMode::GfxstreamGuestAngleHostSwiftshader);
     gpu_mode_candidates.push_back(GpuMode::GfxstreamGuestAngleHostLavapipe);
   }

e2etests/cvd/graphics_detector_tests/main_test.go

@@ -52,7 +52,7 @@ func TestLaunchingWithAutoEnablesGfxstream(t *testing.T) {
 	if err != nil {
 		t.Fatalf("failed to get Vulkan sysprop: %w", err)
 	}
-	if vk_driver != "pastel" {
-		t.Errorf(`"ro.hardware.vulkan" was "%s"; expected "pastel"`, vk_driver)
+	if vk_driver != "ranchu" {
+		t.Errorf(`"ro.hardware.vulkan" was "%s"; expected "ranchu"`, vk_driver)
 	}
 }