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

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