Merge "init: Fix -DUSER_MODE_LINUX compilation" am: 9a38df3f5f
am: d1821522aa

Change-Id: Ic34bcb0be554736edd6c293820ab1fc9ff79bf34