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

* commit 'db733579a4c64eddd7dadb4ac15f54658ccfc0fb':
  atrace: add the 'dalvik' trace category