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

* commit '2a12ad460af139a03c3e9bf5fc7886a7521b333e':
  x86_64: Fix frame size calculation for 64-bit