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

Change-Id: Ia065090e8091fe9a9542173f5ff6da0bf35b47ec