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

* commit '21ec64b16914dfd05e07558b00ada867b7aa8b6e':
  Fix x86 config file to support 2nd ARCH build