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

* commit '3e2b11ba0c0bec11e2d624e1cab43ce2fb567d80':
  VideoEncoderDecoderTest fix maximum calculation