Merge "In favor of SW patch in AudioPolicyManager::connectAudioSource"