am efb44f91: (-s ours) am 53aefba7: am 3a124eb0: am f67f894f: (-s ours) am...

am efb44f91: (-s ours) am 53aefba7: am 3a124eb0: am f67f894f: (-s ours) am ff9a97f6: am 92aa0532: 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 'efb44f91':
  DO NOT MERGE - Fix software video decoder buffer size calculation