Merge "Fix multi-arch build for x86"