Merge "VPN: use ParcelFileDescriptor.adoptFd() instead of doing it in JNI."