Merge "Revert "Revert "Keep internal stack trace methods declaring classes live"""