am 5aa50c66: Merge "Fix x86 config file to support 2nd ARCH build"

* commit '5aa50c6637f88213661b29facaf05f072316dec0':
  Fix x86 config file to support 2nd ARCH build