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

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