Merge "Fix some minor JNI signiture mismatching"