Merge "Support new Systrace dependencies" into nyc-mr1-dev
am: 2fae223cc6

Change-Id: Ie995b1a8f011c8b7dd95db95b2bae7c9846ada4b