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

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