diff --git a/vndk/tools/header-checker/OWNERS b/vndk/tools/header-checker/OWNERS
index 69bf8a830..9bb94e2d5 100644
--- a/vndk/tools/header-checker/OWNERS
+++ b/vndk/tools/header-checker/OWNERS
@@ -2,3 +2,5 @@ andrewhsieh@google.com
 hsinyichen@google.com
 jchowdhary@google.com
 tyanh@google.com
+
+per-file android/* = pirama@google.com, srhines@google.com
diff --git a/vndk/tools/header-checker/android/envsetup.sh b/vndk/tools/header-checker/android/envsetup.sh
index 7a9f9a354..bdfaf804f 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-r437112b
-export LLVM_RELEASE_VERSION=14.0.1
+export LLVM_PREBUILTS_VERSION=clang-r445002
+export LLVM_RELEASE_VERSION=14.0.2