Merge "usb: phy: msm: Fix compilation issues"