Merge "x86_64: Fix frame size calculation for 64-bit"