Merge "tombstoned: change path for traces from "anr_" to "trace_""