Merge "usb: gadget: Add support for multiple android gadgets" into msm-3.4