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

* commit '8e5f0c5d68debe3b90db4c2d22af6c72fb8c34b8':
  Revert "Revert "Keep internal stack trace methods declaring classes live""