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

Change-Id: Ia683b762911e6b97706a52b1a075835fef443b97