Merge "Make vsock available to product and vendor am: b0ed37f95d am: ae8287e995 am: aa3896fc0a am: 9702e5b070 am: 6a3d1c378b"