Merge "Fix /init -> /system/bin/init symlink creation race"