Merge "Clean up JNI code"