am dffe5cdb: Merge "DO NOT MERGE Fix vulnerability in mediaserver" into mnc-dev

* commit 'dffe5cdb436987a65a9010460979507c06b5c904':
  DO NOT MERGE Fix vulnerability in mediaserver