am 9794f903: Merge "atrace: fix tracing on user builds" into jb-mr2-dev

* commit '9794f90368550dba8693a30c61c4bea5c4fb2993':
  atrace: fix tracing on user builds