Merge "Use AUDIO_SESSION_ALLOCATE instead of 0"