[ros-diffs] [tkreuzer] 54827: [USBDRV] remove hacks to fix build