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

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