Backport changes to whitelist sockets opened by the zygote. am: 41ca1bce am: 49d992fd am: 67c4adb5 -s ours am: bf16d345 Change-Id: I5ca638d1b740f08841cbfe9b2da4ae697009ab8e