Backport changes to whitelist sockets opened by the zygote. am: 0f6a0e1560  -s ours am: 6fa8339792 am: c6ced086d1 am: 4474da7b7c am: 5556367bc1
am: 7f78990260

Change-Id: I6a6be5e38a99806f68bf33a2642a79d39f14d3b3