Merge "Support new systrace file structure after switching to catapult"