Merge "x86_64: Rebase on top of "64-bit temp register support""