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

Change-Id: Idf65aae5305fe32920e7fc390d60e5b361b6edd1