Merge "Switch to using int stream instead of AudioAttributes"