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

Change-Id: I66d3c5fb138d60c506be7db4532de7978d504e04