Merge branch 'master' of https://github.com/hunterli/UniversalAdbDriver

Conflicts:
	usb_driver/android_winusb.inf
Merge branch 'master' of https://github.com/hunterli/UniversalAdbDriver

Conflicts:
	usb_driver/android_winusb.inf