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

* commit '059f5c3f6ce2a1783b5d96b4059df1b9104101d5':
  Simplify main thread stack size initialization