Merge "Adjust to new OpenNativeLibrary API." am: 319157a906

am: 2fd0ea8fda

Change-Id: I04472a29b7d900cf5d8980e3d1d5a82d7a8af2b8

core/jni/android_app_NativeActivity.cpp

@@ -286,6 +286,7 @@ loadNativeCode_native(JNIEnv* env, jobject clazz, jstring path, jstring funcName
                                      sdkVersion,
                                      pathStr.c_str(),
                                      classLoader,
+                                     nullptr,
                                      libraryPath,
                                      &needs_native_bridge,
                                      &nativeloader_error_msg);