Merge "systrace for audio" into jb-dev