Merge "Avoid add overflow in summation in AMR-WB decoder"
am: a3354a2190

Change-Id: I5714a1bd699c93078975cf6b8303fdd0107e9d15