Merge "AudioFlinger: Update AudioFlinger class includes" into udc-dev-plus-aosp