diff --git a/runtime/Android.bp b/runtime/Android.bp
index 6d1667a..a615437 100644
--- a/runtime/Android.bp
+++ b/runtime/Android.bp
@@ -407,9 +407,9 @@
     header_libs: [
         "art_cmdlineparser_headers",
         "libnativehelper_header_only",
+        "jni_platform_headers",
     ],
     shared_libs: [
-        "libnativehelper",
         "libnativebridge",
         "libnativeloader",
         "libbacktrace",
diff --git a/runtime/runtime.cc b/runtime/runtime.cc
index 47f033f..9d16f57 100644
--- a/runtime/runtime.cc
+++ b/runtime/runtime.cc
@@ -134,8 +134,6 @@
 #include "native/sun_misc_Unsafe.h"
 #include "native_bridge_art_interface.h"
 #include "native_stack_dump.h"
-#include "nativehelper/JniConstants.h"
-#include "nativehelper/JniConstants-priv.h"
 #include "nativehelper/scoped_local_ref.h"
 #include "oat_file.h"
 #include "oat_file_manager.h"
@@ -412,10 +410,6 @@
   // instance. We rely on a small initialization order issue in Runtime::Start() that requires
   // elements of WellKnownClasses to be null, see b/65500943.
   WellKnownClasses::Clear();
-
-  // Ensure that libnativehelper caching is invalidated, in case a new runtime is to be brought
-  // up later.
-  android::ClearJniConstantsCache();
 }
 
 struct AbortState {
@@ -1553,11 +1547,7 @@
   // Must be in the kNative state for calling native methods (JNI_OnLoad code).
   CHECK_EQ(self->GetState(), kNative);
 
-  // First set up JniConstants, which is used by both the runtime's built-in native
-  // methods and libcore.
-  JniConstants::init(env);
-
-  // Then set up the native methods provided by the runtime itself.
+  // Set up the native methods provided by the runtime itself.
   RegisterRuntimeNativeMethods(env);
 
   // Initialize classes used in JNI. The initialization requires runtime native