Merge "Fix JNI error"