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 am: 8d7fd81b Change-Id: I736c286f9e48dbdfcdc41126a1c754235076b3ab