Merge "Adding /data/local/traces for traceur app"
am: 658e4ddd03

Change-Id: Icd96940adf99c754a6bdb06c42ae8b1ad615cf9d