am b732a7a8: (-s ours) Merge "DO NOT MERGE: media: fix 4k hevc test stream" into lmp-sprout-dev

* commit 'b732a7a8aad6a7c7dea47dee464a8fee183f851b':
  DO NOT MERGE: media: fix 4k hevc test stream