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

* commit '3b58ce7868b7476bcbd81fca5f362c244284adf4':
  Keep internal stack trace methods declaring classes live