Merge "Make mediaserver listen to Codec2 services' deaths" into qt-dev
am: 3738fe1b60

Change-Id: I91c48888ff68c66220161594af6fa7ffc28cab95