Merge "Support new Systrace dependencies" into nyc-mr1-dev am: 7569bff291 am: 5f59124045
am: 2de4f8c5a5

Change-Id: Iafb6b7d948a41f1d533f0fe0aaef355896dcb155