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

* commit '68be0108a701cbae2d9e3335a7b1056d8eedb140':
  Increase AAC software decoder's buffer count. Refactor how clients