am 7d580566: Merge "Increase AAC software decoder\'s buffer count. Refactor how clients" into jb-dev

* commit '7d5805669dea851e70115c494154a2d26b8dc39e':
  Increase AAC software decoder's buffer count. Refactor how clients