Merge "media: fix 4k hevc test stream" into lmp-mr1-dev