diff --git a/lsplant/src/main/jni/art/runtime/class_linker.hpp b/lsplant/src/main/jni/art/runtime/class_linker.hpp
index 655bbc3..fa56484 100644
--- a/lsplant/src/main/jni/art/runtime/class_linker.hpp
+++ b/lsplant/src/main/jni/art/runtime/class_linker.hpp
@@ -134,8 +134,10 @@ public:
         int sdk_int = GetAndroidApiLevel();
 
         if (sdk_int >= __ANDROID_API_R__) {
-            // fixup static trampoline may have been inlined
-            HookSyms(handler, AdjustThreadVisibilityCounter);
+            if constexpr (GetArch() != Arch::kX86 && GetArch() != Arch::kX8664) {
+                // fixup static trampoline may have been inlined
+                HookSyms(handler, AdjustThreadVisibilityCounter);
+            }
         }
 
         if (!RETRIEVE_MEM_FUNC_SYMBOL(
diff --git a/lsplant/src/main/jni/external/dex_builder b/lsplant/src/main/jni/external/dex_builder
index 33c8b50..6022a5c 160000
--- a/lsplant/src/main/jni/external/dex_builder
+++ b/lsplant/src/main/jni/external/dex_builder
@@ -1 +1 @@
-Subproject commit 33c8b50ac7d2498c0db8fe2c6e4273dabc82de75
+Subproject commit 6022a5c25402a928c1ad25d23d17590060507817