Merge 25Q1 (ab/12770256) to aosp-main-future

Bug: 385190204
Merged-In: Ie2744a58c02b2ac5513583daa324e7a9891a26b0
Change-Id: I1535dc493f7ea63f594540ea33c857e28ce2d39c

build/clang.mk

diff --git a/build/clang.mk b/build/clang.mk
index e5768ce..d68b835 100644
--- a/build/clang.mk
+++ b/build/clang.mk
@@ -10,5 +10,5 @@
 endif
 
 # Clang toolchain path ########################################################
-CLANG_TOOLCHAIN_PATH=$(ANDROID_BUILD_TOP)/prebuilts/clang/host/linux-x86/clang-r530567
+CLANG_TOOLCHAIN_PATH=$(ANDROID_BUILD_TOP)/prebuilts/clang/host/linux-x86/clang-r547379
 IS_CLANG_TOOLCHAIN=true