Merge "tombstoned: change path for traces from "anr_" to "trace_"" am: 07a57f0f28 am: c01e0d98f7
am: b5018b9fea

Change-Id: Iad89e209eaaec782db1383505cbb064e8136f91f