Merge "Use AUDIO_SESSION_ALLOCATE instead of hard-coded 0"