Merge "Clean up JNI loading code to support more JNI methods" into main