Merge "VPN: avoid leaking file descriptors."