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

* commit '8ae499e1d3bf7915cd53b410eb8debda66595b86':
  Support new systrace file structure after switching to catapult