am fcc61ec2: Merge "Don\'t set x86 arch variant."

Merge commit 'fcc61ec20932de83d385131983b47f82a2008cd3' into dalvik-dev

* commit 'fcc61ec20932de83d385131983b47f82a2008cd3':
  Don't set x86 arch variant.