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

* commit '625dde7bdf6726b967733bb8b506734824cd6b5a':
  Fix build - support new systrace file structure