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

Change-Id: I88c0fde563218de25fb0fa9a6bd29abf0df44212