Merge "Fix AAC decoder reconfiguration" into jb-mr2-dev