Merge "Move gcov output to /data/misc/trace"