Merge "media: Add xml entry for hevc with CQ codec"