Merge "usb: gadget: change HSIC voting to xo." into msm-3.0