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

Change-Id: I5971687e588d29710ee570058cf6044db2e88805