Support new Systrace dependencies

bug:31335915
bug:31340203
bug:31551133

Change-Id: Ibc315a99bd1c44fe232fdf84836d9305d61a46f3
1 file changed