Merge changes I21eefab9,I0ac7d78a

* changes:
  adb: move usb_* to client/usb_*.
  adb: reorganize adbd USB handling code.