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 'f1dc8e29649b51010bdac55d4f509b2a1fdad922':
  DO NOT MERGE - Fix software video decoder buffer size calculation