--- old/src/hotspot/share/prims/nativeLookup.cpp	2017-10-31 12:29:17.735520797 -0700
+++ new/src/hotspot/share/prims/nativeLookup.cpp	2017-10-31 12:29:17.341484253 -0700
@@ -293,10 +293,12 @@
   char* critical_name = critical_jni_name(method);
 
   // Compute argument size
-  int args_size = 1                             // JNIEnv
-                + (method->is_static() ? 1 : 0) // class for static methods
-                + method->size_of_parameters(); // actual parameters
-
+  int args_size = method->size_of_parameters();
+  for (SignatureStream ss(signature); !ss.at_return_type(); ss.next()) {
+    if (ss.is_array()) {
+        args_size += T_INT_size; // array length parameter
+    }
+  }
 
   // 1) Try JNI short style
   entry = lookup_critical_style(method, critical_name, "",        args_size, true);