Merge "Fix deadlock between vold and init"
am: ec58e5851d

Change-Id: I542e545ae363d53f8d13ef76356518f1fe089fc3