Merge "usb: gadget: Match gadget and gadget_driver according to usb_core_id" into msm-3.4