Merge "Backport changes to whitelist sockets opened by the zygote." into nyc-dev am: 15ab5393 am: 4407f375 am: c3002713 Change-Id: I2f63d7713696550c7edffb39a65613a4d4152c34