Merge "adb: win32: fix adb shell" am: 524716889b
am: ecdf5f3947

* commit 'ecdf5f39474d2f25b939d393b76a813915c885e5':
  adb: win32: fix adb shell