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

* commit '45c3baf9f02b6ba1f89bb6b4cad190d0f1331471':
  Fix a braino in the stack layout.