Backport changes to whitelist sockets opened by the zygote. am: 82c6e6267e  -s ours am: 646ee94421 am: 8f0cc3dd13 am: 8cb6b9335c
am: eb972e5d9d

Change-Id: I8030e2b745fe08b238fd9da5b518729fda05174e