Merge "Undo AArch64 pass-by-pointer for X86-64"