Merge "AudioFlinger: Update AudioFlinger class includes" into main