Merge "Support new Systrace dependencies" into nyc-mr1-dev