diff --git a/vndk/tools/header-checker/android/envsetup.sh b/vndk/tools/header-checker/android/envsetup.sh
index ba4b531b6..dc0a20017 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-r383902b
-export LLVM_RELEASE_VERSION=11.0.2
+export LLVM_PREBUILTS_VERSION=clang-r399163
+export LLVM_RELEASE_VERSION=11.0.4
diff --git a/vndk/tools/header-checker/src/dumper/abi_wrappers.cpp b/vndk/tools/header-checker/src/dumper/abi_wrappers.cpp
index 0bcdc56ff..624220465 100644
--- a/vndk/tools/header-checker/src/dumper/abi_wrappers.cpp
+++ b/vndk/tools/header-checker/src/dumper/abi_wrappers.cpp
@@ -743,8 +743,9 @@ repr::VTableComponentIR RecordDeclWrapper::SetupRecordVTableComponent(
               }
 
               if (thunk_info.isEmpty()) {
-                mangle_contextp_->mangleCXXDtor(
-                    vtable_component.getDestructorDecl(), dtor_type, ostream);
+                auto GD = clang::GlobalDecl(
+                    vtable_component.getDestructorDecl(), dtor_type);
+                mangle_contextp_->mangleName(GD, ostream);
               } else {
                 mangle_contextp_->mangleCXXDtorThunk(
                     vtable_component.getDestructorDecl(), dtor_type,