Backport changes to whitelist sockets opened by the zygote. am: a1252ccbdb am: abd5b05190 -s ours
am: 96eb99506b
Change-Id: If65507590e8802187214184b59d083720943651f
This commit is contained in: