am 7126aedf: am 8ae499e1: Merge "Support new systrace file structure after switching to catapult"

* commit '7126aedfb2f907e34b14ed63d90eb24326ed7521':
  Support new systrace file structure after switching to catapult