Merge "Added missing audio encoder capabilities" into jb-mr1-dev