Merge "dumpstate: don't follow symlinks when creating /data/anr/traces.txt"