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

* commit 'ebd6016b8c6faf70b44283c59461023cda1ca6b0':
  Add audio tag to systrace