Merge "Merge "Build aapt2 statically on windows" into qt-dev am: 274a7b2975 am: a5cfb6cf9a"