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

Change-Id: I51eef49ded8be6a24bea2e7afa0694dbc65bc6f1