Merge "vold: Use the new method of rebooting by asking init to do it"