Merge "Revert "Fix multi-arch build for x86""