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

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