am 4f797b92: Merge "DO NOT MERGE - Fix software video decoder buffer size calculation" into lmp-dev

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