Merge "Fix incorrect prototype for JNI call"