Merge "adb: use correct _WIN32 macro."