Merge "DO NOT MERGE Decoder: Fix allocation for Mbaff weight matrix" into mnc-dev am: cb897471 -s ours am: b2ce6aa1 am: b93a69fc am: 63969de3 -s ours am: a82c945e am: 199f817d Change-Id: I2badd13f96deade4be6c8f514532ce9f572ce766