Merge "vold: add coldboot back and make sure it won't block booting"