am 470fb3ff: am b493c298: Merge "x86_64: Enable some optimizations"

* commit '470fb3ff77d753ab067bcc74b3a8d888ae2ca333':
  x86_64: Enable some optimizations