Merge "Fix x86 config file to support 2nd ARCH build"