am 5ca15ccf: Reconcile with jb-release

* commit '5ca15ccf7336d5aa5a7b563742757fa37092eb48':
  Revert input buffer count for the SoftAAC* decoders back to 4.