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

Change-Id: If4553a6075d24cea4398b035abea26db9998313f