Merge "cutils: Add tracing support"