am 04b68149: am 05b8893f: Merge "x86_64: Fix intrinsics"

* commit '04b68149a68abff6d3efff894421a88cdb0a0549':
  x86_64: Fix intrinsics