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

* commit 'f749a67054e63b9184e67461ab40fe7b4b270241':
  Fix AAC decoder reconfiguration