am 630b075c: Merge "Fix build - support new systrace file structure"

* commit '630b075cdb4299e72d26d8cb355a28c342479201':
  Fix build - support new systrace file structure