Modifications to build configurations, make sure WP is going to x86/ARM, WS to x86/x64/ARM