Merge "Move gcov output to /data/misc/trace" am: 3a6a01bdee
am: af4a358461

Change-Id: I3274fab9240b86b5121daa4ace529eb6a562ec83