Merge "vold: Reboot if vold failure" into sc-v2-dev