Merge "mediaserver, mediaextractor, drmserver: allow vendor_overlay_file"