Merge "ACodec now signals an error if the mediaserver died while it is in" into jb-mr2-dev