diff --git a/vndk/tools/header-checker/android/envsetup.sh b/vndk/tools/header-checker/android/envsetup.sh
index 3a6c6bac9..2c53531d5 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-r365631
-export LLVM_RELEASE_VERSION=9.0.6
+export LLVM_PREBUILTS_VERSION=clang-r365631b
+export LLVM_RELEASE_VERSION=9.0.7