Merge "fastboot: fix USB_TRACE, make it better."