Merge "Merge roctx_trace.txt" into amd-staging

bin/merge_traces.sh

@@ -74,7 +74,7 @@ if ! [ -d "${OUTPUT_DIR}" ] ; then
 fi
 
 echo "Processing directories: $INPUT_DIRS"
-for file in begin_ts_file hcc_ops_trace hsa_handles hip_api_trace; do
+for file in begin_ts_file hcc_ops_trace hsa_handles hip_api_trace roctx_trace; do
   find ${INPUT_DIRS} -type f -regextype sed -regex ".*/[0-9]\{1,\}_${file}\.txt" \
     -not -path "${OUTPUT_DIR}/*" | xargs cat > "${OUTPUT_DIR}/${file}.txt"
 done