Merge "Fix JNI issues in NativeCollation."