Merge "jni: Address the security bug"