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

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