Merge "Fix a few things in the JNI docs."