compiler warning fixes

Conflicts:
	drivers/usb/gadget/android.c