Merge "Backport changes to whitelist sockets opened by the zygote." into nyc-dev am: 15ab539368 am: d18881d4f8
am: c60f54edfb

Change-Id: Ifeda9eb2d6daf0a814fe10c677e3cf88fce17cab