Merge "work-around AudioTrack bug" into jb-dev