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

* commit '5157b1e8355ef3176536e4de793ec1b7679b7ad9':
  ACodec now signals an error if the mediaserver died while it is in