Merge "init: create sockets before forking"
am: 03642ad8b8

Change-Id: I6c36e2d51a8517c04885ace2ac98e19d04e94c37