am a035abc5: am 1303aa28: Merge "Remove useless x86 options that were always hardcoded on."

* commit 'a035abc55455a50da7b242dad1bca55fa28617a9':
  Remove useless x86 options that were always hardcoded on.