ci/android: Update Cuttlefish image

Main changes:
- Use hwcomposer=drm for venus_guest_angle instead of ranchu
- Cherry pick an upstream change in external/minigbm
  https://chromium-review.googlesource.com/c/chromiumos/platform/minigbm/+/6691931

Signed-off-by: Valentine Burley <valentine.burley@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/35786>

.gitlab-ci/container/debian/gitlab-ci.yml

@@ -149,7 +149,7 @@ debian/s390x_build:
     LLVM_VERSION: &debian-android-llvm 19
     CUTTLEFISH_PROJECT_PATH: ao2/aosp-manifest
     CUTTLEFISH_BUILD_VERSION_TAGS: mesa-venus
-    CUTTLEFISH_BUILD_NUMBER: 20250506.001
+    CUTTLEFISH_BUILD_NUMBER: 20250701.001
     AOSP_KERNEL_PROJECT_PATH: ao2/aosp-kernel-manifest
     AOSP_KERNEL_BUILD_VERSION_TAGS: common-android14-6.1-venus
     AOSP_KERNEL_BUILD_NUMBER: 20241107.001

.gitlab-ci/image-tags.yml

@@ -23,7 +23,7 @@ variables:
 
   DEBIAN_BUILD_TAG: "20250611-rust"
 
-  DEBIAN_TEST_ANDROID_TAG: "20250626-acts"
+  DEBIAN_TEST_ANDROID_TAG: "20250701-cuttlefish"
   DEBIAN_TEST_GL_TAG: "20250616-vkcts-main"
   DEBIAN_TEST_VIDEO_TAG: "20250609-helper"
   DEBIAN_TEST_VK_TAG: "20250619-vkd3d"