Merge "Support new Systrace dependencies" into nyc-mr1-dev
am: 7569bff291

Change-Id: Ie64134416dfda2901b2cdee82ec39d9cb6a19e05