Merge "DO NOT MERGE Decoder: Fix allocation for Mbaff weight matrix" into mnc-dev am: cb897471 -s ours am: b2ce6aa1 Change-Id: Id0a8d9db3c2543f657e5f7b064976de220e74afb