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