Revert of Move webrtc/audio/audio_sink.h to webrtc/ and fix some dependencies.

webrtc/voice_engine/channel_proxy.cc

 /*
  *  Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 #include "webrtc/voice_engine/channel_proxy.h"
 
 #include <utility>
 
-#include "webrtc/audio_sink.h"
+#include "webrtc/audio/audio_sink.h"
 #include "webrtc/base/checks.h"
 #include "webrtc/voice_engine/channel.h"
 
 namespace webrtc {
 namespace voe {
 ChannelProxy::ChannelProxy() : channel_owner_(nullptr) {}
 
 ChannelProxy::ChannelProxy(const ChannelOwner& channel_owner) :
     channel_owner_(channel_owner) {
   RTC_CHECK(channel_owner_.channel());
@@ skipping 134 matching lines @@
   channel()->SetSink(std::move(sink));
 }
 
 Channel* ChannelProxy::channel() const {
   RTC_DCHECK(channel_owner_.channel());
   return channel_owner_.channel();
 }
 
 }  // namespace voe
 }  // namespace webrtc