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

* commit '264843a896d7fe6cb36b203a411b4fe778b25f11':
  Support new systrace file structure after switching to catapult