am 669f6792: Merge "mediaserver.te refactor"

* commit '669f679243431084adaaacd6e4857e2eed92b93a':
  mediaserver.te refactor