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

Change-Id: Iaa1637099b925eff224db30053aab7c34d0b7cfd