Merge "DO NOT MERGE Decoder: Fixed allocation size of pred info buffer" into...
Merge "DO NOT MERGE Decoder: Fixed allocation size of pred info buffer" into mnc-dev am: 0a91df5e -s ours am: 2193f242
am: 7d9e1628
Change-Id: I0051251d0d85345af2db77cf9eb85eb77f81f7f7