Merge "Add 64-bit windows cross-compiles"