Merge "usb: gadget: Add snapshot of USB DIAG function driver" into msm-4.8