am 320a91d3: am 9f615938: am 9a788285: Merge "Duplicate i686 target arch options for x86_64."

* commit '320a91d36afae27ec3e95da549934be306fdff64':
  Duplicate i686 target arch options for x86_64.