Merge "Allow adbd to use vsock_socket"