am 3840bf87: am 98155f86: am 5e9746b7: am 1e125c71: Merge "gcam: Add empty SysTrace class" into klp-dev

* commit '3840bf87b9b439c32555fb05dba129a62e15b5e0':