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

Change-Id: I4fdbfba827bc95908fcf16133800e89f0c9f576f