am 8512992f: Merge "Simplify main thread stack size initialization"

* commit '8512992f50e8444c1985bbeb17c3385a58fc0fed':
  Simplify main thread stack size initialization