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

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