Merge "Remove useless x86 options that were always hardcoded on."