am 9a2be5d4: Merge "DO NOT MERGE - Fix software video decoder buffer size calculation" into klp-dev

* commit '9a2be5d49d57b239bf6345f033eab01ba98f3889':
  DO NOT MERGE - Fix software video decoder buffer size calculation