Merge "AudioFlinger: Remove unnecessary friends" into main