Merge "vold: Reboot if vold failure"