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

Change-Id: I9164bfddec7e2e28303b4f6e704f25a600354f54