lisa.trace: Cleanup FtraceConf.add_merged_src()
lisa.trace: Cleanup FtraceConf.add_merged_src()

ARM-software/lisa,ARM-software/lisa,ARM-software/lisa,ARM-software/lisa,credp/lisa,credp/lisa,credp/lisa,credp/lisa