am 9c53671b: Merge "Keep internal stack trace methods declaring classes live"

* commit '9c53671bb659cb47bea82f6cbdd46c0843753e82':
  Keep internal stack trace methods declaring classes live