merge_traces.sh was depending on tblextr.py, and the location of tblextr.py changed from bin to libexec/rocprofiler
Change-Id: I76f1a0f41ffcff26e6a1119dacfb8b2ebd56d17d
[ROCm/rocprofiler commit: 7e8df53c44]
Add roctx_trace to the list of files that need to be merged when
aggregating results from multiple runs.
Change-Id: I5810be9e9220765ed8e8a84eca854131e97e61b1
[ROCm/rocprofiler commit: 4ab94c410a]