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

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