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

Change-Id: Id9314a2c60c243cd0dc49102e34982b8c9734df6