Merge "AAudioService: integrated with audioserver" into oc-dev