Merge "adb: fix adb usb operations on device." am: ad2021a
am: ec4db8f

* commit 'ec4db8f14f8ecc122505f17f93ca7e34ced409b4':
  adb: fix adb usb operations on device.

Change-Id: I6daa50bfdb968ef3f1371f30ee3a378630169ce7