Backport changes to whitelist sockets opened by the zygote. am: 63545150 am: 3ca7dacc am: 7f0598bc -s ours am: d210ab92 Change-Id: Iae241837194dc435f43b496968a621a97b26f30a