Merge "AudioFlinger: Remove unnecessary friends" into udc-qpr-dev-plus-aosp