Merge "Properly signal an error if codec configuration goes wrong." into jb-mr1.1-dev