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

webrtc/modules/audio_device/android/helpers_android.h

Index: webrtc/modules/audio_device/android/helpers_android.h
diff --git a/webrtc/modules/utility/include/helpers_android.h b/webrtc/modules/audio_device/android/helpers_android.h
similarity index 91%
rename from webrtc/modules/utility/include/helpers_android.h
rename to webrtc/modules/audio_device/android/helpers_android.h
index 2840ca965ea24a2f90837edd1b5440097caa91a0..5833497f38b7eee8074a9337ad445be64c11ced2 100644
--- a/webrtc/modules/utility/include/helpers_android.h
+++ b/webrtc/modules/audio_device/android/helpers_android.h
@@ -8,12 +8,14 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MODULES_UTILITY_INCLUDE_HELPERS_ANDROID_H_
-#define WEBRTC_MODULES_UTILITY_INCLUDE_HELPERS_ANDROID_H_
+#ifndef WEBRTC_MODULES_AUDIO_DEVICE_ANDROID_HELPERS_ANDROID_H_

[henrika_webrtc, 2016/11/25 12:12:11]

Lots of Android here...

[the sun, 2016/11/25 19:29:53]

Yes, it looks like the internals of ADM for Android could benefit from some
further cleaning...

+#define WEBRTC_MODULES_AUDIO_DEVICE_ANDROID_HELPERS_ANDROID_H_
 
 #include <jni.h>
 #include <string>
 
+#include "webrtc/base/checks.h"
+
 // Abort the process if |jni| has a Java exception pending.
 // TODO(henrika): merge with CHECK_JNI_EXCEPTION() in jni_helpers.h.
 #define CHECK_EXCEPTION(jni)        \
@@ -84,4 +86,4 @@ class ScopedGlobalRef {
 
 }  // namespace webrtc
 
-#endif  // WEBRTC_MODULES_UTILITY_INCLUDE_HELPERS_ANDROID_H_
+#endif  // WEBRTC_MODULES_AUDIO_DEVICE_ANDROID_HELPERS_ANDROID_H_