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

Change-Id: Idb3826d5bacdc02e0a76d8a9af749cee9abb63d6