Merge "Remove AudioFlinger dependencies on client"