various vold fixes for usb_modeswitch compat