Merge "Build aapt2 statically on windows" into qt-dev