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

* commit '524f99469df44f47fd21d160b8434d40dd11bd65':
  DO NOT MERGE - Fix software video decoder buffer size calculation