Merge changes I11e84a7b,I5adaedd8

* changes:
  adb: fix 64-bit build
  add sideload-host mode to adb