Merge "Backport changes to whitelist sockets opened by the zygote." into nyc-dev am: 15ab5393 am: d18881d4 am: c60f54ed Change-Id: Ifeda9eb2d6daf0a814fe10c677e3cf88fce17cab