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

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