Merge "ipq6018: usb: Enable USB"