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

Change-Id: I38d078326cae81c96e240b8a6c03f4a1289e94ea