usb: gadget: sync with grouper (android.googlesource.com, jb-fr2)

Change-Id: I11d7f6cfa15b0e12e71e6f2edc0788492c68c92d