Merge "atrace: add the webview category" into jb-mr2-dev