diff --git a/vndk/tools/header-checker/android/envsetup.sh b/vndk/tools/header-checker/android/envsetup.sh
index f41ed37bb..e2eee4186 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-r407598
-export LLVM_RELEASE_VERSION=12.0.1
+export LLVM_PREBUILTS_VERSION=clang-r407598b
+export LLVM_RELEASE_VERSION=12.0.2