Merge "usb: gadget: f_mtp: Handle mtp os desc properly" into msm-4.8