Merge "Fix build-mingw64-toolchain.sh"