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 '92aa0532ab7cfd70011f70bc909249b894a840d0':
  DO NOT MERGE - Fix software video decoder buffer size calculation