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

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