Merge "init: create sockets before forking" am: 03642ad8b8 am: 681bb8eea1
am: 0e5d2c23af

Change-Id: I54a6a545489864562b414f3594e426d661dfd3a3