am 05b8893f: Merge "x86_64: Fix intrinsics"

* commit '05b8893fedf121d6a8813d40647bad8456518c58':
  x86_64: Fix intrinsics