am f4c873a6: Merge "Fix AAC decoder reconfiguration" into jb-mr2-dev

* commit 'f4c873a64db2d5d2d74ca596e7482627dd6b4238':
  Fix AAC decoder reconfiguration