Merge "Use local copy of vm_sockets.h on non-Trusty for portability" into main