am 5e47eb95: am 35a7b54e: am f9a51893: (-s ours) am 9a2be5d4: Merge "DO NOT MERGE - Fix software video decoder buffer size calculation" into klp-dev

* commit '5e47eb9512890ea443977d3b54125b33f8259f63':
  DO NOT MERGE - Fix software video decoder buffer size calculation