Merge "AudioFlinger: Update Thread class includes" into main