Merge "usb: gadget: Add support for more than one configuration in android gadget" into msm-3.4