Backport changes to whitelist sockets opened by the zygote. am: 0f6a0e1560 -s ours am: 6fa8339792 am: c6ced086d1
am: 4474da7b7c
Change-Id: Ie14b0e7887bd2da5c986b077f4563bbc306c88be
This commit is contained in: