am 2173582b: resolved conflicts for merge of d9714d34 to lmp-dev-plus-aosp

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