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

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