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

Change-Id: I4853ff99d82ad14efda424de5ce29919e1189caa