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

Change-Id: I981e6cff7d5f44d6e555cf16d2c8c07e367829f6