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

* commit '5f04591d17a7beb3f6a8193c81fd95371bd9d821':
  Workaround x86 interpretter stack overflow