Merge "init: always create a symlink from /init to /system/bin/init" am: ac3c7740ad
am: 15338e8a1d

Change-Id: I36ef4ab74d8366bc2ba9090e5704bf2aac74be5a