Backport changes to whitelist sockets opened by the zygote. am: 63545150c2 am: 3ca7daccf5 am: 7f0598bc4f  -s ours am: d210ab92a8
am: 004a7427da

Change-Id: Icfa7c908494ef31d2d204d85dd8b91f9533849a2