Merge branch '25.x' into cp-25-java-linkage-monitor

Author: zhangskz

.github/workflows/test_upb.yml

@@ -78,7 +78,7 @@ jobs:
         with:
           credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
           bazel-cache: "upb-bazel-windows"
-          bazel: test --cxxopt=/std:c++17 --host_cxxopt=/std:c++17 //upb/... //upb_generator/... //python/... //protos/... //protos_generator/...
+          bazel: test --cxxopt=/std:c++17 --host_cxxopt=/std:c++17 //upb/... //upb_generator/... //protos/... //protos_generator/...
           exclude-targets: -//python:conformance_test -//upb:def_builder_test
 
   macos: