4ab94c410a
Add roctx_trace to the list of files that need to be merged when aggregating results from multiple runs. Change-Id: I5810be9e9220765ed8e8a84eca854131e97e61b1