Merge "Prevent energy overflow in acelp calc_period_factor()" am: eb9319afb2
am: 196f1ce484

Change-Id: I4bcc2e7ff145bffb7f11a090e8a048e9c2d11d76