Clean up internal stack trace construction. am: d34b73b4ac

Change-Id: I1e70d57dd053e85622413fc289776d98151caae4