Merge "x86_64: Handle UnsafeGet/Put equal to x86"