Merge "Fix up missed refactoring in JNI reg and preloaded-classes"