Duplicate i686 target arch options for x86_64.

Change-Id: I94a18562c38a20bac526b348eb98c2aba67a431f