am d30315ef: (-s ours) Merge "Use WellKnownClasses in ThrowStackOverflowError to reduce changes of further stack overflow"

* commit 'd30315ef5ce124a83ef4a8d402608f63b0190141':
  Use WellKnownClasses in ThrowStackOverflowError to reduce changes of further stack overflow