Merge "Backport changes to whitelist sockets opened by the zygote." into nyc-dev