Merge "hal: replace with a proper usb detection method"