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

Change-Id: I539b878c4d7a1372a0245ca5af5d38a846f0f667