Merge "USB HAL: 64-bit compile issues"