am cceaf8d8: am ebd6016b: Merge "Add audio tag to systrace" into jb-dev

* commit 'cceaf8d80d29879c3ce045b8bed92181aaee9d8e':
  Add audio tag to systrace