Merge "mediaserver: remove text relocation support"