Merge "Remove obsolete IAudioFlinger::channelCount()"