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

Change-Id: I5db1d9538c274cf6d5e9a001ba7d38056f3928eb