Merge "Fix path to trace used in perfetto-trace compilation"