Merge changes I3e6e5a22,I6eb3f066

* changes:
  adb: cleanup some portions of client usb interfaces
  adb: clang-format for adb.h and client/usb_windows.cpp