Merge "Support new Systrace dependencies"
am: 79a71c5154

Change-Id: I629ed9e92a8e7d8a43136d1940c4c79628c01201