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

Change-Id: I587af7b6190fe4afab43e92ef6de2df705d3039b