Merge "Fix audioflinger in overflow sanitized builds."
am: cd33e55441

Change-Id: I2fc403b3b4611ff16c1557b21b130e37219ba55a