am 3f8cc8d3: Merge "Revert "Revert "Keep internal stack trace methods declaring classes live"""

* commit '3f8cc8d3454c6289a0b2171000a34bf2297def10':
  Revert "Revert "Keep internal stack trace methods declaring classes live""