Merge "atrace: add the 'dalvik' trace category" into jb-mr2-dev