am 5c13d43f: Merge "x86_64: Handle UnsafeGet/Put equal to x86"

* commit '5c13d43f69a5c893b4ee7abf02772ad526b3d263':
  x86_64: Handle UnsafeGet/Put equal to x86