Backport changes to whitelist sockets opened by the zygote. am: 41ca1bce01 am: 49d992fdb0 am: 67c4adb5c1  -s ours
am: bf16d345a6

Change-Id: I5ca638d1b740f08841cbfe9b2da4ae697009ab8e