Merge "Backport changes to whitelist sockets opened by the zygote." into mnc-dev am: 014016cf am: 447d3798 am: 71e6a6f1 Change-Id: Ib162897a1428ab8c025a414eb0a3872327274f7a