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

Change-Id: I8c33caec1a869caa4ea3d1b7e2cfcb3a9a6787ea