Merge "Fix deadlock between vold and init" am: ec58e5851d am: b957474b61
am: 3577e4c351

Change-Id: Ifbc94b0160c828c05c72e405ce6318a1126b2c4e