drivers: usb: gadget: Backport from caf-jb_mr1_chocolate

Conflicts:
	drivers/usb/gadget/android.c
	drivers/usb/gadget/u_bam.c
	drivers/usb/gadget/u_serial.c