rustc: Make build_wrap_ret compile on Windows and unrevert ABI patch

This reverts commit 625405562c278cb2e45bec6805f13d2c1de8049e.