Merge "Fix /init -> /system/bin/init symlink creation race" am: 50f5246352
am: 24d37b9265

Change-Id: I0a2627b8f14400c352f735dd458e6c19cd52fd70