Merge "Updated JNI interface."