Merge "Allow access to vsock in goldfish" am: a6c54adfe7 am: e8b59705ba

Original change: https://android-review.googlesource.com/c/device/generic/goldfish/+/1446158

Change-Id: Iee252227df810b7c2489cd7ab604e571e91dda52