Merge "Fix build - support new systrace file structure"