Merge "usb: msm8974: Select USB_ARCH_HAS_XHCI by default" into msm-3.4