Merge "Duplicate i686 target arch options for x86_64."