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

Change-Id: Ic39bf6e7c1b5cc11dc4fbdea505371ae814aa3f2