These ones actually build, at the cost of needing C++ redist again. Working versions of the static tools will be built later. Fixes d1e91f5cfb6653c01a8413476316947dc363777c
This is a merge of an unrelated history. --allow-unrelated-histories was used.