Merge "Support new Systrace dependencies" am: 79a71c5154 am: f172d72232
am: 3d12243c40

Change-Id: Ib6328c5b79f49d82fa21af08414e60d81e1b42db