Merge "VPN: merge JNI methods."