Merge "adb: properly handle path separators on Windows." am: 8591f719d0
am: 82f9eef468

* commit '82f9eef468547a5417d1c094e5406bca683ec285':
  adb: properly handle path separators on Windows.