diff --git a/vndk/tools/header-checker/android/update_clang-tools.sh b/vndk/tools/header-checker/android/update_clang-tools.sh
index 577e19391..ed6958502 100755
--- a/vndk/tools/header-checker/android/update_clang-tools.sh
+++ b/vndk/tools/header-checker/android/update_clang-tools.sh
@@ -60,6 +60,10 @@ update_prebuilts () {
   rm .fetch* || true
 
   find . | xargs touch
+
+  # create symlink lib -> lib64 as toolchain libraries have a RUNPATH pointing
+  # to $ORIGIN/../lib instead of lib64
+  ln -s lib64 lib
 }