Merge "JNI dlsym lookup fixes."