Merge "VPN: refactor few JNI methods for the usage of legacy VPN."