Merge "conf_files: Limit the mpeg4 encoder spec on kona and lito"