am 1e5decfc: am a4aed71a: am f1dc8e29: (-s ours) am 524f9946: am 76b3fb29: am 4fd0696a: am 4f797b92: Merge "DO NOT MERGE - Fix software video decoder buffer size calculation" into lmp-dev

* commit '1e5decfc5d881e88b3a970f22f34ba7b673f9ffd':
  DO NOT MERGE - Fix software video decoder buffer size calculation