am 07b84413: Merge "Fix a braino in the stack layout."

* commit '07b8441303ea82fca3cb85d71ecf8752d73cedd7':
  Fix a braino in the stack layout.