am b11616a7: am 3e2b11ba: Merge "VideoEncoderDecoderTest fix maximum calculation" into klp-dev

* commit 'b11616a7f6cce9aed682e2d043fd91c71bb3ce4c':
  VideoEncoderDecoderTest fix maximum calculation