Update build tags such that we can properly compile on all platforms Upstream-commit: 2128eb52eda1a65e725a9a98f500a468778092f0 Component: engine