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

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