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