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

Change-Id: Iad04d9353d319cef0a30d3c40a9baad68bc88ba6