Merge "gcam: Add empty SysTrace class" into klp-dev