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