am 34a127aa: am 5f04591d: am 0e78ff7e: Merge "Workaround x86 interpretter stack overflow"

* commit '34a127aaabfa768cb2479252ca259f239633611e':
  Workaround x86 interpretter stack overflow