am a326d124: am 64a14565: am 66bae2f3: Merge "Fix build - the stack frame is too large."

* commit 'a326d124b61f9979caf99e5ce4874a48bd19c264':
  Fix build - the stack frame is too large.