Backport changes to whitelist sockets opened by the zygote. am: a1252ccbdb
am: 94e09df49b  -s ours

Change-Id: Ie7ccb210c84177c9bb95bf402716e1a85e4e7882