Merge "Fix deadlock between vold and init"