Merge "Support new Systrace dependencies"