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

Change-Id: I752d4033e167136482274df8f08e7559d6258759