Merge "Support new systrace file structure after refactor"