Merge "conf_files: scuba: tune perf xml for avc decoder"