am 25538257: Merge "cutils: add a way to disable tracing for a process" into jb-mr2-dev

* commit '2553825797c40b14981b1b24e44475e07b02267f':
  cutils: add a way to disable tracing for a process