Merge "adb: properly handle path separators on Windows."