Merge "libcutils: add a trace tag for Dalvik" into jb-mr2-dev