Merge "Add /dev/socket/uncrypt." into nyc-dev