Merge "Clean up adb Win32 symlink #ifdefs."