am 8faf921a: am d2aaf5c1: Merge "Revert "Keep internal stack trace methods declaring classes live""

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