am 5c783cb0: am 625dde7b: am 630b075c: Merge "Fix build - support new systrace file structure"

* commit '5c783cb0f3d35df0507d61858c845a68ffa1aaa1':
  Fix build - support new systrace file structure