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