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

Change-Id: I48312d03f0edd3a0295da8abaf844e486cc79a84