am 5157b1e8: Merge "ACodec now signals an error if the mediaserver died while...
am 5157b1e8: Merge "ACodec now signals an error if the mediaserver died while it is in" into jb-mr2-dev
* commit '5157b1e8':
ACodec now signals an error if the mediaserver died while it is in