diff --git a/vndk/tools/header-checker/android/envsetup.sh b/vndk/tools/header-checker/android/envsetup.sh
index 2c53531d5..e372a8058 100644
--- a/vndk/tools/header-checker/android/envsetup.sh
+++ b/vndk/tools/header-checker/android/envsetup.sh
@@ -15,5 +15,5 @@
 # limitations under the License.
 
 export LLVM_BUILD_HOST_TOOLS=true
-export LLVM_PREBUILTS_VERSION=clang-r365631b
-export LLVM_RELEASE_VERSION=9.0.7
+export LLVM_PREBUILTS_VERSION=clang-r370808
+export LLVM_RELEASE_VERSION=10.0.1