diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml
index 9d3ca1709..9f22ddb1c 100644
--- a/.bazelci/presubmit.yml
+++ b/.bazelci/presubmit.yml
@@ -4,7 +4,8 @@ bazel: last_green
 
 tools_flags: &tools_flags
   ? "--enable_bzlmod=false"
-  ? "--incompatible_enable_android_toolchain_resolution=false"
+  ? "--incompatible_enable_android_toolchain_resolution=true"
+  ? "--android_platforms=//:armeabi-v7a"
   # Sandboxed SDK tools depend on libraries that require Java runtime 17 or higher.
   ? "--java_runtime_version=17"
 rules_flags: &rules_flags
@@ -103,5 +104,9 @@ tasks:
     working_directory: examples/basicapp
     build_flags:
       <<: *rules_flags
+      ? "--enable_bzlmod"
+      ? "--android_platforms=@rules_android//:armeabi-v7a"
+      ? "--incompatible_enable_android_toolchain_resolution=true"
+      ? "--java_runtime_version=17"
     build_targets:
       - "//java/com/basicapp:basic_app"
diff --git a/MODULE.bazel b/MODULE.bazel
index c3cb43f4b..181da81ae 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -21,6 +21,8 @@ register_toolchains("//toolchains/android_sdk:all")
 
 register_toolchains("//toolchains/emulator:all")
 
+register_toolchains("@bazel_tools//tools/cpp:all")
+
 # go-related dependency setup
 bazel_dep(name = "rules_go", version = "0.43.0", repo_name = "io_bazel_rules_go")
 bazel_dep(name = "gazelle", version = "0.28.0", repo_name = "bazel_gazelle")