Merge "Increase AAC software decoder's buffer count. Refactor how clients" into jb-dev