Prefer Gfxstream over Gfxstream+ANGLE temporarily

until AMD check updated.

Author: jmacnak

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

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

e2etests/cvd/graphics_detector_tests/main_test.go

@@ -44,8 +44,8 @@ func TestLaunchingWithAutoEnablesGfxstream(t *testing.T) {
 	if err != nil {
 		t.Fatalf("failed to get EGL sysprop: %w", err)
 	}
-	if gl_driver != "angle" {
-		t.Errorf(`"ro.hardware.egl" was "%s"; expected "angle"`, gl_driver)
+	if gl_driver != "emulation" {
+		t.Errorf(`"ro.hardware.egl" was "%s"; expected "emulation"`, gl_driver)
 	}
 
 	vk_driver, err := c.GetSyspropString("ro.hardware.vulkan")