Merge "Add the trace tag for Dalvik." into jb-mr2-dev