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

Change-Id: I18eb30a8cc47596561b5264dabcad135f6c13b5d