diff --git a/bazel/llvm.bzl b/bazel/llvm.bzl
index bb417ba50..87fdfd868 100644
--- a/bazel/llvm.bzl
+++ b/bazel/llvm.bzl
@@ -53,7 +53,7 @@ def _llvm_loader_repository(repository_ctx):
             executable = False,
         )
 
-LLVM_COMMIT_SHA = "ec28be3ccac432ea6a45eca67249b209be216c0a"
+LLVM_COMMIT_SHA = "10b539f13eae2db79c3dc27dec3a6c5ca75542f8"
 
 def llvm_loader_repository_dependencies():
     # This *declares* the dependency, but it won't actually be *downloaded* unless it's used.
diff --git a/rs_bindings_from_cc/test/bazel_unit_tests/cc_std/cc_std_test.bzl b/rs_bindings_from_cc/test/bazel_unit_tests/cc_std/cc_std_test.bzl
index 1b1ead759..96b0fc811 100644
--- a/rs_bindings_from_cc/test/bazel_unit_tests/cc_std/cc_std_test.bzl
+++ b/rs_bindings_from_cc/test/bazel_unit_tests/cc_std/cc_std_test.bzl
@@ -101,7 +101,7 @@ cc_std_test = rule(
             default = "//third_party/stl:stl_headers",
         ),
         "_llvm_builtin_headers": attr.label(
-            default = "@llvm-project//clang:builtin_headers_filegroup",
+            default = "@llvm-project//clang:builtin_headers_files",
         ),
         # TODO: b/421934470 - Fix uses of exec groups and re-enable AEG
         "_use_auto_exec_groups": attr.bool(default = False),