Merge "mediaserver: remove text relocation support"
am: db20b8e8d4

* commit 'db20b8e8d41d9da0f4e341974ec65cbcebb15a6f':
  mediaserver: remove text relocation support