Revert of Move ADM specific Android files into modules/audio_device/android/

webrtc/voice_engine/voice_engine_impl.cc

 /*
  *  Copyright (c) 2012 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.
  */
 
 #if defined(WEBRTC_ANDROID)
-#include "webrtc/modules/audio_device/android/jvm_android.h"
+#include "webrtc/modules/audio_device/android/audio_device_template.h"
+#include "webrtc/modules/audio_device/android/audio_record_jni.h"
+#include "webrtc/modules/audio_device/android/audio_track_jni.h"
+#include "webrtc/modules/utility/include/jvm_android.h"
 #endif
 
 #include "webrtc/base/checks.h"
 #include "webrtc/modules/audio_coding/include/audio_coding_module.h"
 #include "webrtc/system_wrappers/include/trace.h"
 #include "webrtc/voice_engine/channel_proxy.h"
 #include "webrtc/voice_engine/voice_engine_impl.h"
 
 namespace webrtc {
 
@@ skipping 118 matching lines @@
 
 std::string VoiceEngine::GetVersionString() {
   std::string version = "VoiceEngine 4.1.0";
 #ifdef WEBRTC_EXTERNAL_TRANSPORT
   version += " (External transport build)";
 #endif
   return version;
 }
 
 }  // namespace webrtc