Merge "Use separate WINE to test 32- and 64-bit windows toolchain"