Merge "Move VPN JNI to the bottom of srcs"