am d372c5c3: Merge changes I11e84a7b,I5adaedd8

* commit 'd372c5c36510b99254b031d3fd5958e246a85544':
  adb: fix 64-bit build
  add sideload-host mode to adb