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

* commit '9a78828590298001aacc425f9c0c8aae10366493':
  Duplicate i686 target arch options for x86_64.