Bug 1437345 - Update generated files; r=jesup a=NPOTB
authorDan Minor <dminor@mozilla.com>
Mon, 19 Mar 2018 08:35:21 -0700
changeset 463392 856a4e5b3748bcf170b5e5cbd301728f7f7be638
parent 463391 71cfdba55f269cc95196149303d8705b9030864d
child 463393 f453337749a3fd288e5591e804c9fdb24fe41afd
push id1683
push usersfraser@mozilla.com
push dateThu, 26 Apr 2018 16:43:40 +0000
treeherdermozilla-release@5af6cb21869d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjesup, NPOTB
bugs1437345
milestone60.0
Bug 1437345 - Update generated files; r=jesup a=NPOTB MozReview-Commit-ID: 5xmc2mrA2mz
media/webrtc/gn-configs/arm64_False_arm64_freebsd.json
media/webrtc/gn-configs/arm64_True_arm64_freebsd.json
media/webrtc/gn-configs/x64_False_arm64_android.json
media/webrtc/gn-configs/x64_False_arm_android.json
media/webrtc/gn-configs/x64_False_x64_dragonfly.json
media/webrtc/gn-configs/x64_False_x64_freebsd.json
media/webrtc/gn-configs/x64_False_x64_linux.json
media/webrtc/gn-configs/x64_False_x64_mac.json
media/webrtc/gn-configs/x64_False_x64_netbsd.json
media/webrtc/gn-configs/x64_False_x64_openbsd.json
media/webrtc/gn-configs/x64_False_x64_win.json
media/webrtc/gn-configs/x64_False_x86_android.json
media/webrtc/gn-configs/x64_True_arm64_android.json
media/webrtc/gn-configs/x64_True_arm_android.json
media/webrtc/gn-configs/x64_True_x64_dragonfly.json
media/webrtc/gn-configs/x64_True_x64_freebsd.json
media/webrtc/gn-configs/x64_True_x64_linux.json
media/webrtc/gn-configs/x64_True_x64_mac.json
media/webrtc/gn-configs/x64_True_x64_netbsd.json
media/webrtc/gn-configs/x64_True_x64_openbsd.json
media/webrtc/gn-configs/x64_True_x64_win.json
media/webrtc/gn-configs/x64_True_x86_android.json
media/webrtc/gn-configs/x86_False_x86_freebsd.json
media/webrtc/gn-configs/x86_False_x86_linux.json
media/webrtc/gn-configs/x86_False_x86_netbsd.json
media/webrtc/gn-configs/x86_False_x86_openbsd.json
media/webrtc/gn-configs/x86_False_x86_win.json
media/webrtc/gn-configs/x86_True_x86_freebsd.json
media/webrtc/gn-configs/x86_True_x86_linux.json
media/webrtc/gn-configs/x86_True_x86_netbsd.json
media/webrtc/gn-configs/x86_True_x86_openbsd.json
media/webrtc/gn-configs/x86_True_x86_win.json
media/webrtc/trunk/moz.build
media/webrtc/trunk/webrtc/api/audio_mixer_api_gn/moz.build
media/webrtc/trunk/webrtc/api/call_api_gn/moz.build
media/webrtc/trunk/webrtc/api/transport_api_gn/moz.build
media/webrtc/trunk/webrtc/api/video_frame_api_gn/moz.build
media/webrtc/trunk/webrtc/audio/audio_gn/moz.build
media/webrtc/trunk/webrtc/audio/utility/audio_frame_operations_gn/moz.build
media/webrtc/trunk/webrtc/base/gtest_prod_gn/moz.build
media/webrtc/trunk/webrtc/base/rtc_base_approved_gn/moz.build
media/webrtc/trunk/webrtc/base/rtc_numerics_gn/moz.build
media/webrtc/trunk/webrtc/base/rtc_task_queue_gn/moz.build
media/webrtc/trunk/webrtc/call/call_gn/moz.build
media/webrtc/trunk/webrtc/call/call_interfaces_gn/moz.build
media/webrtc/trunk/webrtc/common_audio/common_audio_c_gn/moz.build
media/webrtc/trunk/webrtc/common_audio/common_audio_gn/moz.build
media/webrtc/trunk/webrtc/common_audio/common_audio_neon_c_gn/moz.build
media/webrtc/trunk/webrtc/common_audio/common_audio_neon_gn/moz.build
media/webrtc/trunk/webrtc/common_audio/common_audio_sse2_gn/moz.build
media/webrtc/trunk/webrtc/common_video/common_video_gn/moz.build
media/webrtc/trunk/webrtc/logging/rtc_event_log_api_gn/moz.build
media/webrtc/trunk/webrtc/logging/rtc_event_log_impl_gn/moz.build
media/webrtc/trunk/webrtc/media/mozilla_rtc_media_gn/moz.build
media/webrtc/trunk/webrtc/modules/audio_coding/audio_coding_gn/moz.build
media/webrtc/trunk/webrtc/modules/audio_coding/audio_decoder_factory_interface_gn/moz.build
media/webrtc/trunk/webrtc/modules/audio_coding/audio_decoder_interface_gn/moz.build
media/webrtc/trunk/webrtc/modules/audio_coding/audio_encoder_interface_gn/moz.build
media/webrtc/trunk/webrtc/modules/audio_coding/audio_format_conversion_gn/moz.build
media/webrtc/trunk/webrtc/modules/audio_coding/audio_format_gn/moz.build
media/webrtc/trunk/webrtc/modules/audio_coding/audio_network_adaptor_gn/moz.build
media/webrtc/trunk/webrtc/modules/audio_coding/builtin_audio_decoder_factory_gn/moz.build
media/webrtc/trunk/webrtc/modules/audio_coding/cng_gn/moz.build
media/webrtc/trunk/webrtc/modules/audio_coding/g711_c_gn/moz.build
media/webrtc/trunk/webrtc/modules/audio_coding/g711_gn/moz.build
media/webrtc/trunk/webrtc/modules/audio_coding/g722_c_gn/moz.build
media/webrtc/trunk/webrtc/modules/audio_coding/g722_gn/moz.build
media/webrtc/trunk/webrtc/modules/audio_coding/isac_c_gn/moz.build
media/webrtc/trunk/webrtc/modules/audio_coding/isac_common_gn/moz.build
media/webrtc/trunk/webrtc/modules/audio_coding/isac_fix_c_gn/moz.build
media/webrtc/trunk/webrtc/modules/audio_coding/isac_fix_gn/moz.build
media/webrtc/trunk/webrtc/modules/audio_coding/isac_gn/moz.build
media/webrtc/trunk/webrtc/modules/audio_coding/isac_neon_gn/moz.build
media/webrtc/trunk/webrtc/modules/audio_coding/neteq_gn/moz.build
media/webrtc/trunk/webrtc/modules/audio_coding/pcm16b_c_gn/moz.build
media/webrtc/trunk/webrtc/modules/audio_coding/pcm16b_gn/moz.build
media/webrtc/trunk/webrtc/modules/audio_coding/rent_a_codec_gn/moz.build
media/webrtc/trunk/webrtc/modules/audio_coding/webrtc_opus_c_gn/moz.build
media/webrtc/trunk/webrtc/modules/audio_coding/webrtc_opus_gn/moz.build
media/webrtc/trunk/webrtc/modules/audio_conference_mixer/audio_conference_mixer_gn/moz.build
media/webrtc/trunk/webrtc/modules/audio_device/audio_device_gn/moz.build
media/webrtc/trunk/webrtc/modules/audio_mixer/audio_frame_manipulator_gn/moz.build
media/webrtc/trunk/webrtc/modules/audio_mixer/audio_mixer_impl_gn/moz.build
media/webrtc/trunk/webrtc/modules/audio_processing/audio_processing_c_gn/moz.build
media/webrtc/trunk/webrtc/modules/audio_processing/audio_processing_gn/moz.build
media/webrtc/trunk/webrtc/modules/audio_processing/audio_processing_neon_c_gn/moz.build
media/webrtc/trunk/webrtc/modules/audio_processing/audio_processing_neon_gn/moz.build
media/webrtc/trunk/webrtc/modules/audio_processing/audio_processing_sse2_gn/moz.build
media/webrtc/trunk/webrtc/modules/bitrate_controller/bitrate_controller_gn/moz.build
media/webrtc/trunk/webrtc/modules/congestion_controller/congestion_controller_gn/moz.build
media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn/moz.build
media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_gn/moz.build
media/webrtc/trunk/webrtc/modules/desktop_capture/primitives_gn/moz.build
media/webrtc/trunk/webrtc/modules/media_file/media_file_gn/moz.build
media/webrtc/trunk/webrtc/modules/pacing/pacing_gn/moz.build
media/webrtc/trunk/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_gn/moz.build
media/webrtc/trunk/webrtc/modules/rtp_rtcp/rtp_rtcp_gn/moz.build
media/webrtc/trunk/webrtc/modules/utility/utility_gn/moz.build
media/webrtc/trunk/webrtc/modules/video_capture/video_capture_internal_impl_gn/moz.build
media/webrtc/trunk/webrtc/modules/video_capture/video_capture_module_gn/moz.build
media/webrtc/trunk/webrtc/modules/video_coding/video_coding_gn/moz.build
media/webrtc/trunk/webrtc/modules/video_coding/video_coding_utility_gn/moz.build
media/webrtc/trunk/webrtc/modules/video_coding/webrtc_h264_gn/moz.build
media/webrtc/trunk/webrtc/modules/video_coding/webrtc_i420_gn/moz.build
media/webrtc/trunk/webrtc/modules/video_coding/webrtc_vp8_gn/moz.build
media/webrtc/trunk/webrtc/modules/video_coding/webrtc_vp9_gn/moz.build
media/webrtc/trunk/webrtc/modules/video_processing/video_processing_gn/moz.build
media/webrtc/trunk/webrtc/modules/video_processing/video_processing_neon_gn/moz.build
media/webrtc/trunk/webrtc/modules/video_processing/video_processing_sse2_gn/moz.build
media/webrtc/trunk/webrtc/system_wrappers/cpu_features_linux_gn/moz.build
media/webrtc/trunk/webrtc/system_wrappers/field_trial_default_gn/moz.build
media/webrtc/trunk/webrtc/system_wrappers/metrics_default_gn/moz.build
media/webrtc/trunk/webrtc/system_wrappers/system_wrappers_gn/moz.build
media/webrtc/trunk/webrtc/video/video_gn/moz.build
media/webrtc/trunk/webrtc/video_engine/video_engine_gn/moz.build
media/webrtc/trunk/webrtc/voice_engine/audio_coder_gn/moz.build
media/webrtc/trunk/webrtc/voice_engine/file_player_gn/moz.build
media/webrtc/trunk/webrtc/voice_engine/file_recorder_gn/moz.build
media/webrtc/trunk/webrtc/voice_engine/level_indicator_gn/moz.build
media/webrtc/trunk/webrtc/voice_engine/voice_engine_gn/moz.build
media/webrtc/trunk/webrtc/webrtc_common_gn/moz.build
media/webrtc/trunk/webrtc/webrtc_gn/moz.build
--- a/media/webrtc/gn-configs/arm64_False_arm64_freebsd.json
+++ b/media/webrtc/gn-configs/arm64_False_arm64_freebsd.json
@@ -76,17 +76,16 @@
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "_FORTIFY_SOURCE=2",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD"
             ],
             "deps": [
@@ -160,17 +159,16 @@
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "_FORTIFY_SOURCE=2",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD"
             ],
             "deps": [
@@ -249,17 +247,16 @@
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "_FORTIFY_SOURCE=2",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD"
             ],
             "deps": [],
@@ -331,17 +328,16 @@
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "_FORTIFY_SOURCE=2",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD"
             ],
             "deps": [
@@ -422,17 +418,16 @@
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "_FORTIFY_SOURCE=2",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD"
             ],
             "deps": [
@@ -501,17 +496,16 @@
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "_FORTIFY_SOURCE=2",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD",
                 "WEBRTC_BUILD_LIBEVENT"
             ],
@@ -617,17 +611,16 @@
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "_FORTIFY_SOURCE=2",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD"
             ],
             "deps": [],
@@ -699,17 +692,16 @@
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "_FORTIFY_SOURCE=2",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD"
             ],
             "deps": [],
@@ -867,17 +859,16 @@
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "_FORTIFY_SOURCE=2",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD"
             ],
             "deps": [
@@ -953,17 +944,16 @@
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "_FORTIFY_SOURCE=2",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_BUILD_LIBEVENT",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD"
             ],
@@ -1040,17 +1030,16 @@
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "_FORTIFY_SOURCE=2",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD",
                 "WEBRTC_BUILD_LIBEVENT"
             ],
@@ -1138,17 +1127,16 @@
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "_FORTIFY_SOURCE=2",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD"
             ],
             "deps": [],
@@ -1217,17 +1205,16 @@
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "_FORTIFY_SOURCE=2",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD"
             ],
             "deps": [
@@ -1345,17 +1332,16 @@
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "_FORTIFY_SOURCE=2",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD"
             ],
             "deps": [],
@@ -1474,17 +1460,16 @@
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "_FORTIFY_SOURCE=2",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD"
             ],
             "deps": [
@@ -1551,17 +1536,16 @@
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "_FORTIFY_SOURCE=2",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD"
             ],
             "deps": [],
@@ -1627,17 +1611,16 @@
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "_FORTIFY_SOURCE=2",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD",
                 "WEBRTC_BUILD_LIBEVENT"
             ],
@@ -1745,17 +1728,16 @@
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "_FORTIFY_SOURCE=2",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD"
             ],
             "deps": [],
@@ -1819,17 +1801,16 @@
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "_FORTIFY_SOURCE=2",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD",
                 "WEBRTC_BUILD_LIBEVENT"
             ],
@@ -1910,17 +1891,16 @@
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "_FORTIFY_SOURCE=2",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD"
             ],
             "deps": [],
@@ -1999,17 +1979,16 @@
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "_FORTIFY_SOURCE=2",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD"
             ],
             "deps": [
@@ -2124,17 +2103,16 @@
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "_FORTIFY_SOURCE=2",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD"
             ],
             "deps": [
@@ -2211,17 +2189,16 @@
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "_FORTIFY_SOURCE=2",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD"
             ],
             "deps": [
@@ -2299,17 +2276,16 @@
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "_FORTIFY_SOURCE=2",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD"
             ],
             "deps": [
@@ -2385,17 +2361,16 @@
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "_FORTIFY_SOURCE=2",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD"
             ],
             "deps": [
@@ -2470,17 +2445,16 @@
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "_FORTIFY_SOURCE=2",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD"
             ],
             "deps": [
@@ -2557,17 +2531,16 @@
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "_FORTIFY_SOURCE=2",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD"
             ],
             "deps": [
@@ -2668,17 +2641,16 @@
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "_FORTIFY_SOURCE=2",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD"
             ],
             "deps": [
@@ -2771,17 +2743,16 @@
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "_FORTIFY_SOURCE=2",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD"
             ],
             "deps": [
@@ -2866,17 +2837,16 @@
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "_FORTIFY_SOURCE=2",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD"
             ],
             "deps": [
@@ -2959,17 +2929,16 @@
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "_FORTIFY_SOURCE=2",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD"
             ],
             "deps": [
@@ -3046,17 +3015,16 @@
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "_FORTIFY_SOURCE=2",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD"
             ],
             "deps": [
@@ -3139,17 +3107,16 @@
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "_FORTIFY_SOURCE=2",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD"
             ],
             "deps": [
@@ -3227,17 +3194,16 @@
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "_FORTIFY_SOURCE=2",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD"
             ],
             "deps": [
@@ -3317,17 +3283,16 @@
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "_FORTIFY_SOURCE=2",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD"
             ],
             "deps": [
@@ -3460,17 +3425,16 @@
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "_FORTIFY_SOURCE=2",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD"
             ],
             "deps": [
@@ -3548,17 +3512,16 @@
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "_FORTIFY_SOURCE=2",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD"
             ],
             "deps": [
@@ -3644,17 +3607,16 @@
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "_FORTIFY_SOURCE=2",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD"
             ],
             "deps": [
@@ -3784,17 +3746,16 @@
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "_FORTIFY_SOURCE=2",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD"
             ],
             "deps": [
@@ -3882,17 +3843,16 @@
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "_FORTIFY_SOURCE=2",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD"
             ],
             "deps": [
@@ -4067,17 +4027,16 @@
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "_FORTIFY_SOURCE=2",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD"
             ],
             "deps": [
@@ -4163,17 +4122,16 @@
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "_FORTIFY_SOURCE=2",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD"
             ],
             "deps": [
@@ -4252,17 +4210,16 @@
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "_FORTIFY_SOURCE=2",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD"
             ],
             "deps": [
@@ -4358,17 +4315,16 @@
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "_FORTIFY_SOURCE=2",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD"
             ],
             "deps": [
@@ -4457,17 +4413,16 @@
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "_FORTIFY_SOURCE=2",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD"
             ],
             "deps": [
@@ -4537,17 +4492,16 @@
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "_FORTIFY_SOURCE=2",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD"
             ],
             "deps": [
@@ -4619,26 +4573,26 @@
                 "-Wno-missing-field-initializers",
                 "-Wno-strict-overflow",
                 "-Wimplicit-fallthrough",
                 "-Wthread-safety",
                 "-Winconsistent-missing-override",
                 "-Wundef"
             ],
             "defines": [
+                "WEBRTC_DUMMY_AUDIO_BUILD",
                 "V8_DEPRECATION_WARNINGS",
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "_FORTIFY_SOURCE=2",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD",
                 "WEBRTC_BUILD_LIBEVENT"
             ],
@@ -4672,18 +4626,16 @@
                 "//webrtc/modules/audio_device/dummy/file_audio_device.cc",
                 "//webrtc/modules/audio_device/dummy/file_audio_device.h",
                 "//webrtc/modules/audio_device/fine_audio_buffer.cc",
                 "//webrtc/modules/audio_device/fine_audio_buffer.h",
                 "//webrtc/modules/audio_device/include/audio_device.h",
                 "//webrtc/modules/audio_device/include/audio_device_defines.h",
                 "//webrtc/modules/audio_device/opensl/single_rw_fifo.cc",
                 "//webrtc/modules/audio_device/opensl/single_rw_fifo.h",
-                "//webrtc/modules/audio_device/audio_device_impl.cc",
-                "//webrtc/modules/audio_device/audio_device_impl.h",
                 "//webrtc/modules/audio_device/dummy/file_audio_device_factory.cc",
                 "//webrtc/modules/audio_device/dummy/file_audio_device_factory.h"
             ],
             "type": "static_library"
         },
         "//webrtc/modules/audio_mixer:audio_frame_manipulator": {
             "cflags": [
                 "-fno-strict-aliasing",
@@ -4742,17 +4694,16 @@
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "_FORTIFY_SOURCE=2",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD"
             ],
             "deps": [
@@ -4828,17 +4779,16 @@
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "_FORTIFY_SOURCE=2",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD"
             ],
             "deps": [
@@ -4925,17 +4875,16 @@
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "_FORTIFY_SOURCE=2",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD"
             ],
             "deps": [
@@ -5171,17 +5120,16 @@
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "_FORTIFY_SOURCE=2",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD"
             ],
             "deps": [
@@ -5272,17 +5220,16 @@
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "_FORTIFY_SOURCE=2",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD"
             ],
             "deps": [
@@ -5363,17 +5310,16 @@
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "_FORTIFY_SOURCE=2",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD"
             ],
             "deps": [
@@ -5441,17 +5387,16 @@
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "_FORTIFY_SOURCE=2",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD",
                 "WEBRTC_BUILD_LIBEVENT"
             ],
@@ -5525,17 +5470,16 @@
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "_FORTIFY_SOURCE=2",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD",
                 "WEBRTC_BUILD_LIBEVENT"
             ],
@@ -5634,17 +5578,16 @@
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "_FORTIFY_SOURCE=2",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD"
             ],
             "deps": [
@@ -5771,17 +5714,16 @@
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "_FORTIFY_SOURCE=2",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD"
             ],
             "deps": [
@@ -5857,17 +5799,16 @@
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "_FORTIFY_SOURCE=2",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD"
             ],
             "deps": [
@@ -5944,17 +5885,16 @@
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "_FORTIFY_SOURCE=2",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD",
                 "WEBRTC_BUILD_LIBEVENT"
             ],
@@ -6032,17 +5972,16 @@
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "_FORTIFY_SOURCE=2",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD"
             ],
             "deps": [
@@ -6130,17 +6069,16 @@
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "_FORTIFY_SOURCE=2",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD",
                 "WEBRTC_BUILD_LIBEVENT"
             ],
@@ -6366,17 +6304,16 @@
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "_FORTIFY_SOURCE=2",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD",
                 "WEBRTC_BUILD_LIBEVENT"
             ],
@@ -6460,17 +6397,16 @@
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "_FORTIFY_SOURCE=2",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD",
                 "WEBRTC_BUILD_LIBEVENT"
             ],
@@ -6543,17 +6479,16 @@
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "_FORTIFY_SOURCE=2",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD",
                 "WEBRTC_BUILD_LIBEVENT"
             ],
@@ -6635,17 +6570,16 @@
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "_FORTIFY_SOURCE=2",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD",
                 "WEBRTC_BUILD_LIBEVENT"
             ],
@@ -6791,17 +6725,16 @@
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "_FORTIFY_SOURCE=2",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD",
                 "WEBRTC_BUILD_LIBEVENT"
             ],
@@ -6889,17 +6822,16 @@
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "_FORTIFY_SOURCE=2",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD",
                 "WEBRTC_BUILD_LIBEVENT"
             ],
@@ -6969,17 +6901,16 @@
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "_FORTIFY_SOURCE=2",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD",
                 "WEBRTC_BUILD_LIBEVENT"
             ],
@@ -7052,17 +6983,16 @@
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "_FORTIFY_SOURCE=2",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD",
                 "WEBRTC_BUILD_LIBEVENT"
             ],
@@ -7149,17 +7079,16 @@
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "_FORTIFY_SOURCE=2",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD",
                 "WEBRTC_BUILD_LIBEVENT"
             ],
@@ -7237,17 +7166,16 @@
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "_FORTIFY_SOURCE=2",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD",
                 "WEBRTC_BUILD_LIBEVENT"
             ],
@@ -7342,17 +7270,16 @@
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "_FORTIFY_SOURCE=2",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD"
             ],
             "deps": [],
@@ -7425,17 +7352,16 @@
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "_FORTIFY_SOURCE=2",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD"
             ],
             "deps": [],
@@ -7508,17 +7434,16 @@
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "_FORTIFY_SOURCE=2",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD"
             ],
             "deps": [],
@@ -7592,17 +7517,16 @@
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "_FORTIFY_SOURCE=2",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD"
             ],
             "deps": [
@@ -7708,17 +7632,16 @@
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "_FORTIFY_SOURCE=2",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD",
                 "WEBRTC_BUILD_LIBEVENT"
             ],
@@ -7850,17 +7773,16 @@
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "_FORTIFY_SOURCE=2",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD"
             ],
             "deps": [
@@ -7928,17 +7850,16 @@
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "_FORTIFY_SOURCE=2",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD"
             ],
             "deps": [
@@ -8011,17 +7932,16 @@
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "_FORTIFY_SOURCE=2",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD"
             ],
             "deps": [
@@ -8095,17 +8015,16 @@
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "_FORTIFY_SOURCE=2",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD"
             ],
             "deps": [
@@ -8188,17 +8107,16 @@
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "_FORTIFY_SOURCE=2",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD"
             ],
             "deps": [
@@ -8270,17 +8188,16 @@
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "_FORTIFY_SOURCE=2",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD",
                 "WEBRTC_BUILD_LIBEVENT"
             ],
@@ -8443,17 +8360,16 @@
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "_FORTIFY_SOURCE=2",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD",
                 "WEBRTC_BUILD_LIBEVENT"
             ],
@@ -8562,17 +8478,16 @@
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "_FORTIFY_SOURCE=2",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD"
             ],
             "deps": [],
--- a/media/webrtc/gn-configs/arm64_True_arm64_freebsd.json
+++ b/media/webrtc/gn-configs/arm64_True_arm64_freebsd.json
@@ -71,17 +71,16 @@
             "defines": [
                 "V8_DEPRECATION_WARNINGS",
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "DYNAMIC_ANNOTATIONS_ENABLED=1",
                 "WTF_USE_DYNAMIC_ANNOTATIONS=1",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD"
             ],
             "deps": [
@@ -150,17 +149,16 @@
             "defines": [
                 "V8_DEPRECATION_WARNINGS",
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "DYNAMIC_ANNOTATIONS_ENABLED=1",
                 "WTF_USE_DYNAMIC_ANNOTATIONS=1",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD"
             ],
             "deps": [
@@ -234,17 +232,16 @@
             "defines": [
                 "V8_DEPRECATION_WARNINGS",
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "DYNAMIC_ANNOTATIONS_ENABLED=1",
                 "WTF_USE_DYNAMIC_ANNOTATIONS=1",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD"
             ],
             "deps": [],
@@ -311,17 +308,16 @@
             "defines": [
                 "V8_DEPRECATION_WARNINGS",
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "DYNAMIC_ANNOTATIONS_ENABLED=1",
                 "WTF_USE_DYNAMIC_ANNOTATIONS=1",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD"
             ],
             "deps": [
@@ -397,17 +393,16 @@
             "defines": [
                 "V8_DEPRECATION_WARNINGS",
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "DYNAMIC_ANNOTATIONS_ENABLED=1",
                 "WTF_USE_DYNAMIC_ANNOTATIONS=1",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD"
             ],
             "deps": [
@@ -471,17 +466,16 @@
             "defines": [
                 "V8_DEPRECATION_WARNINGS",
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "DYNAMIC_ANNOTATIONS_ENABLED=1",
                 "WTF_USE_DYNAMIC_ANNOTATIONS=1",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD",
                 "WEBRTC_BUILD_LIBEVENT"
             ],
@@ -582,17 +576,16 @@
             "defines": [
                 "V8_DEPRECATION_WARNINGS",
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "DYNAMIC_ANNOTATIONS_ENABLED=1",
                 "WTF_USE_DYNAMIC_ANNOTATIONS=1",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD"
             ],
             "deps": [],
@@ -659,17 +652,16 @@
             "defines": [
                 "V8_DEPRECATION_WARNINGS",
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "DYNAMIC_ANNOTATIONS_ENABLED=1",
                 "WTF_USE_DYNAMIC_ANNOTATIONS=1",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD"
             ],
             "deps": [],
@@ -822,17 +814,16 @@
             "defines": [
                 "V8_DEPRECATION_WARNINGS",
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "DYNAMIC_ANNOTATIONS_ENABLED=1",
                 "WTF_USE_DYNAMIC_ANNOTATIONS=1",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD"
             ],
             "deps": [
@@ -903,17 +894,16 @@
             "defines": [
                 "V8_DEPRECATION_WARNINGS",
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "DYNAMIC_ANNOTATIONS_ENABLED=1",
                 "WTF_USE_DYNAMIC_ANNOTATIONS=1",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_BUILD_LIBEVENT",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD"
             ],
@@ -985,17 +975,16 @@
             "defines": [
                 "V8_DEPRECATION_WARNINGS",
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "DYNAMIC_ANNOTATIONS_ENABLED=1",
                 "WTF_USE_DYNAMIC_ANNOTATIONS=1",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD",
                 "WEBRTC_BUILD_LIBEVENT"
             ],
@@ -1078,17 +1067,16 @@
             "defines": [
                 "V8_DEPRECATION_WARNINGS",
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "DYNAMIC_ANNOTATIONS_ENABLED=1",
                 "WTF_USE_DYNAMIC_ANNOTATIONS=1",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD"
             ],
             "deps": [],
@@ -1152,17 +1140,16 @@
             "defines": [
                 "V8_DEPRECATION_WARNINGS",
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "DYNAMIC_ANNOTATIONS_ENABLED=1",
                 "WTF_USE_DYNAMIC_ANNOTATIONS=1",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD"
             ],
             "deps": [
@@ -1275,17 +1262,16 @@
             "defines": [
                 "V8_DEPRECATION_WARNINGS",
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "DYNAMIC_ANNOTATIONS_ENABLED=1",
                 "WTF_USE_DYNAMIC_ANNOTATIONS=1",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD"
             ],
             "deps": [],
@@ -1399,17 +1385,16 @@
             "defines": [
                 "V8_DEPRECATION_WARNINGS",
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "DYNAMIC_ANNOTATIONS_ENABLED=1",
                 "WTF_USE_DYNAMIC_ANNOTATIONS=1",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD"
             ],
             "deps": [
@@ -1471,17 +1456,16 @@
             "defines": [
                 "V8_DEPRECATION_WARNINGS",
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "DYNAMIC_ANNOTATIONS_ENABLED=1",
                 "WTF_USE_DYNAMIC_ANNOTATIONS=1",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD"
             ],
             "deps": [],
@@ -1542,17 +1526,16 @@
             "defines": [
                 "V8_DEPRECATION_WARNINGS",
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "DYNAMIC_ANNOTATIONS_ENABLED=1",
                 "WTF_USE_DYNAMIC_ANNOTATIONS=1",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD",
                 "WEBRTC_BUILD_LIBEVENT"
             ],
@@ -1655,17 +1638,16 @@
             "defines": [
                 "V8_DEPRECATION_WARNINGS",
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "DYNAMIC_ANNOTATIONS_ENABLED=1",
                 "WTF_USE_DYNAMIC_ANNOTATIONS=1",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD"
             ],
             "deps": [],
@@ -1724,17 +1706,16 @@
             "defines": [
                 "V8_DEPRECATION_WARNINGS",
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "DYNAMIC_ANNOTATIONS_ENABLED=1",
                 "WTF_USE_DYNAMIC_ANNOTATIONS=1",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD",
                 "WEBRTC_BUILD_LIBEVENT"
             ],
@@ -1810,17 +1791,16 @@
             "defines": [
                 "V8_DEPRECATION_WARNINGS",
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "DYNAMIC_ANNOTATIONS_ENABLED=1",
                 "WTF_USE_DYNAMIC_ANNOTATIONS=1",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD"
             ],
             "deps": [],
@@ -1894,17 +1874,16 @@
                 "WEBRTC_CODEC_G722",
                 "V8_DEPRECATION_WARNINGS",
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "DYNAMIC_ANNOTATIONS_ENABLED=1",
                 "WTF_USE_DYNAMIC_ANNOTATIONS=1",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD"
             ],
             "deps": [
@@ -2014,17 +1993,16 @@
             "defines": [
                 "V8_DEPRECATION_WARNINGS",
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "DYNAMIC_ANNOTATIONS_ENABLED=1",
                 "WTF_USE_DYNAMIC_ANNOTATIONS=1",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD"
             ],
             "deps": [
@@ -2096,17 +2074,16 @@
             "defines": [
                 "V8_DEPRECATION_WARNINGS",
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "DYNAMIC_ANNOTATIONS_ENABLED=1",
                 "WTF_USE_DYNAMIC_ANNOTATIONS=1",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD"
             ],
             "deps": [
@@ -2179,17 +2156,16 @@
             "defines": [
                 "V8_DEPRECATION_WARNINGS",
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "DYNAMIC_ANNOTATIONS_ENABLED=1",
                 "WTF_USE_DYNAMIC_ANNOTATIONS=1",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD"
             ],
             "deps": [
@@ -2260,17 +2236,16 @@
             "defines": [
                 "V8_DEPRECATION_WARNINGS",
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "DYNAMIC_ANNOTATIONS_ENABLED=1",
                 "WTF_USE_DYNAMIC_ANNOTATIONS=1",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD"
             ],
             "deps": [
@@ -2340,17 +2315,16 @@
             "defines": [
                 "V8_DEPRECATION_WARNINGS",
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "DYNAMIC_ANNOTATIONS_ENABLED=1",
                 "WTF_USE_DYNAMIC_ANNOTATIONS=1",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD"
             ],
             "deps": [
@@ -2422,17 +2396,16 @@
             "defines": [
                 "V8_DEPRECATION_WARNINGS",
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "DYNAMIC_ANNOTATIONS_ENABLED=1",
                 "WTF_USE_DYNAMIC_ANNOTATIONS=1",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD"
             ],
             "deps": [
@@ -2528,17 +2501,16 @@
                 "WEBRTC_CODEC_G722",
                 "V8_DEPRECATION_WARNINGS",
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "DYNAMIC_ANNOTATIONS_ENABLED=1",
                 "WTF_USE_DYNAMIC_ANNOTATIONS=1",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD"
             ],
             "deps": [
@@ -2626,17 +2598,16 @@
             "defines": [
                 "V8_DEPRECATION_WARNINGS",
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "DYNAMIC_ANNOTATIONS_ENABLED=1",
                 "WTF_USE_DYNAMIC_ANNOTATIONS=1",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD"
             ],
             "deps": [
@@ -2716,17 +2687,16 @@
             "defines": [
                 "V8_DEPRECATION_WARNINGS",
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "DYNAMIC_ANNOTATIONS_ENABLED=1",
                 "WTF_USE_DYNAMIC_ANNOTATIONS=1",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD"
             ],
             "deps": [
@@ -2804,17 +2774,16 @@
             "defines": [
                 "V8_DEPRECATION_WARNINGS",
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "DYNAMIC_ANNOTATIONS_ENABLED=1",
                 "WTF_USE_DYNAMIC_ANNOTATIONS=1",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD"
             ],
             "deps": [
@@ -2886,17 +2855,16 @@
             "defines": [
                 "V8_DEPRECATION_WARNINGS",
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "DYNAMIC_ANNOTATIONS_ENABLED=1",
                 "WTF_USE_DYNAMIC_ANNOTATIONS=1",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD"
             ],
             "deps": [
@@ -2974,17 +2942,16 @@
             "defines": [
                 "V8_DEPRECATION_WARNINGS",
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "DYNAMIC_ANNOTATIONS_ENABLED=1",
                 "WTF_USE_DYNAMIC_ANNOTATIONS=1",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD"
             ],
             "deps": [
@@ -3057,17 +3024,16 @@
             "defines": [
                 "V8_DEPRECATION_WARNINGS",
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "DYNAMIC_ANNOTATIONS_ENABLED=1",
                 "WTF_USE_DYNAMIC_ANNOTATIONS=1",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD"
             ],
             "deps": [
@@ -3142,17 +3108,16 @@
             "defines": [
                 "V8_DEPRECATION_WARNINGS",
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "DYNAMIC_ANNOTATIONS_ENABLED=1",
                 "WTF_USE_DYNAMIC_ANNOTATIONS=1",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD"
             ],
             "deps": [
@@ -3280,17 +3245,16 @@
             "defines": [
                 "V8_DEPRECATION_WARNINGS",
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "DYNAMIC_ANNOTATIONS_ENABLED=1",
                 "WTF_USE_DYNAMIC_ANNOTATIONS=1",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD"
             ],
             "deps": [
@@ -3363,17 +3327,16 @@
             "defines": [
                 "V8_DEPRECATION_WARNINGS",
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "DYNAMIC_ANNOTATIONS_ENABLED=1",
                 "WTF_USE_DYNAMIC_ANNOTATIONS=1",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD"
             ],
             "deps": [
@@ -3454,17 +3417,16 @@
             "defines": [
                 "V8_DEPRECATION_WARNINGS",
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "DYNAMIC_ANNOTATIONS_ENABLED=1",
                 "WTF_USE_DYNAMIC_ANNOTATIONS=1",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD"
             ],
             "deps": [
@@ -3589,17 +3551,16 @@
             "defines": [
                 "V8_DEPRECATION_WARNINGS",
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "DYNAMIC_ANNOTATIONS_ENABLED=1",
                 "WTF_USE_DYNAMIC_ANNOTATIONS=1",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD"
             ],
             "deps": [
@@ -3682,17 +3643,16 @@
                 "WEBRTC_CODEC_G722",
                 "V8_DEPRECATION_WARNINGS",
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "DYNAMIC_ANNOTATIONS_ENABLED=1",
                 "WTF_USE_DYNAMIC_ANNOTATIONS=1",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD"
             ],
             "deps": [
@@ -3862,17 +3822,16 @@
             "defines": [
                 "V8_DEPRECATION_WARNINGS",
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "DYNAMIC_ANNOTATIONS_ENABLED=1",
                 "WTF_USE_DYNAMIC_ANNOTATIONS=1",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD"
             ],
             "deps": [
@@ -3953,17 +3912,16 @@
             "defines": [
                 "V8_DEPRECATION_WARNINGS",
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "DYNAMIC_ANNOTATIONS_ENABLED=1",
                 "WTF_USE_DYNAMIC_ANNOTATIONS=1",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD"
             ],
             "deps": [
@@ -4037,17 +3995,16 @@
                 "WEBRTC_CODEC_G722",
                 "V8_DEPRECATION_WARNINGS",
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "DYNAMIC_ANNOTATIONS_ENABLED=1",
                 "WTF_USE_DYNAMIC_ANNOTATIONS=1",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD"
             ],
             "deps": [
@@ -4138,17 +4095,16 @@
                 "WEBRTC_OPUS_VARIABLE_COMPLEXITY=0",
                 "V8_DEPRECATION_WARNINGS",
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "DYNAMIC_ANNOTATIONS_ENABLED=1",
                 "WTF_USE_DYNAMIC_ANNOTATIONS=1",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD"
             ],
             "deps": [
@@ -4232,17 +4188,16 @@
             "defines": [
                 "V8_DEPRECATION_WARNINGS",
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "DYNAMIC_ANNOTATIONS_ENABLED=1",
                 "WTF_USE_DYNAMIC_ANNOTATIONS=1",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD"
             ],
             "deps": [
@@ -4307,17 +4262,16 @@
             "defines": [
                 "V8_DEPRECATION_WARNINGS",
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "DYNAMIC_ANNOTATIONS_ENABLED=1",
                 "WTF_USE_DYNAMIC_ANNOTATIONS=1",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD"
             ],
             "deps": [
@@ -4386,24 +4340,24 @@
                 "-Wno-missing-field-initializers",
                 "-Wno-strict-overflow",
                 "-Wimplicit-fallthrough",
                 "-Wthread-safety",
                 "-Winconsistent-missing-override",
                 "-Wundef"
             ],
             "defines": [
+                "WEBRTC_DUMMY_AUDIO_BUILD",
                 "V8_DEPRECATION_WARNINGS",
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "DYNAMIC_ANNOTATIONS_ENABLED=1",
                 "WTF_USE_DYNAMIC_ANNOTATIONS=1",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD",
                 "WEBRTC_BUILD_LIBEVENT"
             ],
@@ -4437,18 +4391,16 @@
                 "//webrtc/modules/audio_device/dummy/file_audio_device.cc",
                 "//webrtc/modules/audio_device/dummy/file_audio_device.h",
                 "//webrtc/modules/audio_device/fine_audio_buffer.cc",
                 "//webrtc/modules/audio_device/fine_audio_buffer.h",
                 "//webrtc/modules/audio_device/include/audio_device.h",
                 "//webrtc/modules/audio_device/include/audio_device_defines.h",
                 "//webrtc/modules/audio_device/opensl/single_rw_fifo.cc",
                 "//webrtc/modules/audio_device/opensl/single_rw_fifo.h",
-                "//webrtc/modules/audio_device/audio_device_impl.cc",
-                "//webrtc/modules/audio_device/audio_device_impl.h",
                 "//webrtc/modules/audio_device/dummy/file_audio_device_factory.cc",
                 "//webrtc/modules/audio_device/dummy/file_audio_device_factory.h"
             ],
             "type": "static_library"
         },
         "//webrtc/modules/audio_mixer:audio_frame_manipulator": {
             "cflags": [
                 "-fno-strict-aliasing",
@@ -4502,17 +4454,16 @@
             "defines": [
                 "V8_DEPRECATION_WARNINGS",
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "DYNAMIC_ANNOTATIONS_ENABLED=1",
                 "WTF_USE_DYNAMIC_ANNOTATIONS=1",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD"
             ],
             "deps": [
@@ -4583,17 +4534,16 @@
             "defines": [
                 "V8_DEPRECATION_WARNINGS",
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "DYNAMIC_ANNOTATIONS_ENABLED=1",
                 "WTF_USE_DYNAMIC_ANNOTATIONS=1",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD"
             ],
             "deps": [
@@ -4675,17 +4625,16 @@
                 "WEBRTC_NS_FIXED",
                 "V8_DEPRECATION_WARNINGS",
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "DYNAMIC_ANNOTATIONS_ENABLED=1",
                 "WTF_USE_DYNAMIC_ANNOTATIONS=1",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD"
             ],
             "deps": [
@@ -4916,17 +4865,16 @@
             "defines": [
                 "V8_DEPRECATION_WARNINGS",
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "DYNAMIC_ANNOTATIONS_ENABLED=1",
                 "WTF_USE_DYNAMIC_ANNOTATIONS=1",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD"
             ],
             "deps": [
@@ -5012,17 +4960,16 @@
                 "WEBRTC_APM_DEBUG_DUMP=1",
                 "V8_DEPRECATION_WARNINGS",
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "DYNAMIC_ANNOTATIONS_ENABLED=1",
                 "WTF_USE_DYNAMIC_ANNOTATIONS=1",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD"
             ],
             "deps": [
@@ -5098,17 +5045,16 @@
             "defines": [
                 "V8_DEPRECATION_WARNINGS",
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "DYNAMIC_ANNOTATIONS_ENABLED=1",
                 "WTF_USE_DYNAMIC_ANNOTATIONS=1",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD"
             ],
             "deps": [
@@ -5171,17 +5117,16 @@
                 "BWE_TEST_LOGGING_COMPILE_TIME_ENABLE=0",
                 "V8_DEPRECATION_WARNINGS",
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "DYNAMIC_ANNOTATIONS_ENABLED=1",
                 "WTF_USE_DYNAMIC_ANNOTATIONS=1",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD",
                 "WEBRTC_BUILD_LIBEVENT"
             ],
@@ -5250,17 +5195,16 @@
                 "BWE_TEST_LOGGING_COMPILE_TIME_ENABLE=0",
                 "V8_DEPRECATION_WARNINGS",
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "DYNAMIC_ANNOTATIONS_ENABLED=1",
                 "WTF_USE_DYNAMIC_ANNOTATIONS=1",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD",
                 "WEBRTC_BUILD_LIBEVENT"
             ],
@@ -5354,17 +5298,16 @@
                 "MULTI_MONITOR_SCREENSHARE",
                 "V8_DEPRECATION_WARNINGS",
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "DYNAMIC_ANNOTATIONS_ENABLED=1",
                 "WTF_USE_DYNAMIC_ANNOTATIONS=1",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD"
             ],
             "deps": [
@@ -5486,17 +5429,16 @@
             "defines": [
                 "V8_DEPRECATION_WARNINGS",
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "DYNAMIC_ANNOTATIONS_ENABLED=1",
                 "WTF_USE_DYNAMIC_ANNOTATIONS=1",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD"
             ],
             "deps": [
@@ -5567,17 +5509,16 @@
             "defines": [
                 "V8_DEPRECATION_WARNINGS",
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "DYNAMIC_ANNOTATIONS_ENABLED=1",
                 "WTF_USE_DYNAMIC_ANNOTATIONS=1",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD"
             ],
             "deps": [
@@ -5649,17 +5590,16 @@
             "defines": [
                 "V8_DEPRECATION_WARNINGS",
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "DYNAMIC_ANNOTATIONS_ENABLED=1",
                 "WTF_USE_DYNAMIC_ANNOTATIONS=1",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD",
                 "WEBRTC_BUILD_LIBEVENT"
             ],
@@ -5732,17 +5672,16 @@
                 "BWE_TEST_LOGGING_COMPILE_TIME_ENABLE=0",
                 "V8_DEPRECATION_WARNINGS",
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "DYNAMIC_ANNOTATIONS_ENABLED=1",
                 "WTF_USE_DYNAMIC_ANNOTATIONS=1",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD"
             ],
             "deps": [
@@ -5825,17 +5764,16 @@
                 "BWE_TEST_LOGGING_COMPILE_TIME_ENABLE=0",
                 "V8_DEPRECATION_WARNINGS",
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "DYNAMIC_ANNOTATIONS_ENABLED=1",
                 "WTF_USE_DYNAMIC_ANNOTATIONS=1",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD",
                 "WEBRTC_BUILD_LIBEVENT"
             ],
@@ -6056,17 +5994,16 @@
             "defines": [
                 "V8_DEPRECATION_WARNINGS",
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "DYNAMIC_ANNOTATIONS_ENABLED=1",
                 "WTF_USE_DYNAMIC_ANNOTATIONS=1",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD",
                 "WEBRTC_BUILD_LIBEVENT"
             ],
@@ -6145,17 +6082,16 @@
             "defines": [
                 "V8_DEPRECATION_WARNINGS",
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "DYNAMIC_ANNOTATIONS_ENABLED=1",
                 "WTF_USE_DYNAMIC_ANNOTATIONS=1",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD",
                 "WEBRTC_BUILD_LIBEVENT"
             ],
@@ -6223,17 +6159,16 @@
             "defines": [
                 "V8_DEPRECATION_WARNINGS",
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "DYNAMIC_ANNOTATIONS_ENABLED=1",
                 "WTF_USE_DYNAMIC_ANNOTATIONS=1",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD",
                 "WEBRTC_BUILD_LIBEVENT"
             ],
@@ -6310,17 +6245,16 @@
             "defines": [
                 "V8_DEPRECATION_WARNINGS",
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "DYNAMIC_ANNOTATIONS_ENABLED=1",
                 "WTF_USE_DYNAMIC_ANNOTATIONS=1",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD",
                 "WEBRTC_BUILD_LIBEVENT"
             ],
@@ -6461,17 +6395,16 @@
             "defines": [
                 "V8_DEPRECATION_WARNINGS",
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "DYNAMIC_ANNOTATIONS_ENABLED=1",
                 "WTF_USE_DYNAMIC_ANNOTATIONS=1",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD",
                 "WEBRTC_BUILD_LIBEVENT"
             ],
@@ -6554,17 +6487,16 @@
             "defines": [
                 "V8_DEPRECATION_WARNINGS",
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "DYNAMIC_ANNOTATIONS_ENABLED=1",
                 "WTF_USE_DYNAMIC_ANNOTATIONS=1",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD",
                 "WEBRTC_BUILD_LIBEVENT"
             ],
@@ -6629,17 +6561,16 @@
             "defines": [
                 "V8_DEPRECATION_WARNINGS",
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "DYNAMIC_ANNOTATIONS_ENABLED=1",
                 "WTF_USE_DYNAMIC_ANNOTATIONS=1",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD",
                 "WEBRTC_BUILD_LIBEVENT"
             ],
@@ -6707,17 +6638,16 @@
             "defines": [
                 "V8_DEPRECATION_WARNINGS",
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "DYNAMIC_ANNOTATIONS_ENABLED=1",
                 "WTF_USE_DYNAMIC_ANNOTATIONS=1",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD",
                 "WEBRTC_BUILD_LIBEVENT"
             ],
@@ -6799,17 +6729,16 @@
             "defines": [
                 "V8_DEPRECATION_WARNINGS",
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "DYNAMIC_ANNOTATIONS_ENABLED=1",
                 "WTF_USE_DYNAMIC_ANNOTATIONS=1",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD",
                 "WEBRTC_BUILD_LIBEVENT"
             ],
@@ -6882,17 +6811,16 @@
             "defines": [
                 "V8_DEPRECATION_WARNINGS",
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "DYNAMIC_ANNOTATIONS_ENABLED=1",
                 "WTF_USE_DYNAMIC_ANNOTATIONS=1",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD",
                 "WEBRTC_BUILD_LIBEVENT"
             ],
@@ -6982,17 +6910,16 @@
             "defines": [
                 "V8_DEPRECATION_WARNINGS",
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "DYNAMIC_ANNOTATIONS_ENABLED=1",
                 "WTF_USE_DYNAMIC_ANNOTATIONS=1",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD"
             ],
             "deps": [],
@@ -7060,17 +6987,16 @@
             "defines": [
                 "V8_DEPRECATION_WARNINGS",
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "DYNAMIC_ANNOTATIONS_ENABLED=1",
                 "WTF_USE_DYNAMIC_ANNOTATIONS=1",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD"
             ],
             "deps": [],
@@ -7138,17 +7064,16 @@
             "defines": [
                 "V8_DEPRECATION_WARNINGS",
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "DYNAMIC_ANNOTATIONS_ENABLED=1",
                 "WTF_USE_DYNAMIC_ANNOTATIONS=1",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD"
             ],
             "deps": [],
@@ -7217,17 +7142,16 @@
                 "WEBRTC_THREAD_RR",
                 "V8_DEPRECATION_WARNINGS",
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "DYNAMIC_ANNOTATIONS_ENABLED=1",
                 "WTF_USE_DYNAMIC_ANNOTATIONS=1",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD"
             ],
             "deps": [
@@ -7328,17 +7252,16 @@
             "defines": [
                 "V8_DEPRECATION_WARNINGS",
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "DYNAMIC_ANNOTATIONS_ENABLED=1",
                 "WTF_USE_DYNAMIC_ANNOTATIONS=1",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD",
                 "WEBRTC_BUILD_LIBEVENT"
             ],
@@ -7465,17 +7388,16 @@
             "defines": [
                 "V8_DEPRECATION_WARNINGS",
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "DYNAMIC_ANNOTATIONS_ENABLED=1",
                 "WTF_USE_DYNAMIC_ANNOTATIONS=1",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD"
             ],
             "deps": [
@@ -7538,17 +7460,16 @@
             "defines": [
                 "V8_DEPRECATION_WARNINGS",
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "DYNAMIC_ANNOTATIONS_ENABLED=1",
                 "WTF_USE_DYNAMIC_ANNOTATIONS=1",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD"
             ],
             "deps": [
@@ -7616,17 +7537,16 @@
             "defines": [
                 "V8_DEPRECATION_WARNINGS",
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "DYNAMIC_ANNOTATIONS_ENABLED=1",
                 "WTF_USE_DYNAMIC_ANNOTATIONS=1",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD"
             ],
             "deps": [
@@ -7695,17 +7615,16 @@
             "defines": [
                 "V8_DEPRECATION_WARNINGS",
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "DYNAMIC_ANNOTATIONS_ENABLED=1",
                 "WTF_USE_DYNAMIC_ANNOTATIONS=1",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD"
             ],
             "deps": [
@@ -7783,17 +7702,16 @@
             "defines": [
                 "V8_DEPRECATION_WARNINGS",
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "DYNAMIC_ANNOTATIONS_ENABLED=1",
                 "WTF_USE_DYNAMIC_ANNOTATIONS=1",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD"
             ],
             "deps": [
@@ -7860,17 +7778,16 @@
             "defines": [
                 "V8_DEPRECATION_WARNINGS",
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "DYNAMIC_ANNOTATIONS_ENABLED=1",
                 "WTF_USE_DYNAMIC_ANNOTATIONS=1",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD",
                 "WEBRTC_BUILD_LIBEVENT"
             ],
@@ -8028,17 +7945,16 @@
             "defines": [
                 "V8_DEPRECATION_WARNINGS",
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "DYNAMIC_ANNOTATIONS_ENABLED=1",
                 "WTF_USE_DYNAMIC_ANNOTATIONS=1",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD",
                 "WEBRTC_BUILD_LIBEVENT"
             ],
@@ -8142,17 +8058,16 @@
             "defines": [
                 "V8_DEPRECATION_WARNINGS",
                 "USE_X11=1",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "DYNAMIC_ANNOTATIONS_ENABLED=1",
                 "WTF_USE_DYNAMIC_ANNOTATIONS=1",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_BSD"
             ],
             "deps": [],
--- a/media/webrtc/gn-configs/x64_False_arm64_android.json
+++ b/media/webrtc/gn-configs/x64_False_arm64_android.json
@@ -67,32 +67,31 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
                 "WEBRTC_ANDROID_OPENSLES"
             ],
             "deps": [
                 "//webrtc/base:rtc_base_approved"
             ],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-aarch64-linux-android/gn-output/gen/"
+                "/home/dminor/src/fennec/obj-aarch64-linux-android/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [
                 "log"
             ],
             "sources": [
                 "//webrtc/api/audio/audio_mixer.h"
             ],
             "type": "source_set"
@@ -146,17 +145,16 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
                 "WEBRTC_ANDROID_OPENSLES"
@@ -166,17 +164,17 @@
                 "//webrtc/api:audio_mixer_api",
                 "//webrtc/api:transport_api",
                 "//webrtc/base:rtc_base_approved",
                 "//webrtc/modules/audio_coding:audio_decoder_factory_interface",
                 "//webrtc/modules/audio_coding:audio_encoder_interface"
             ],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-aarch64-linux-android/gn-output/gen/"
+                "/home/dminor/src/fennec/obj-aarch64-linux-android/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [
                 "log"
             ],
             "sources": [
                 "//webrtc/api/call/audio_sink.h"
             ],
             "type": "source_set"
@@ -230,30 +228,29 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
                 "WEBRTC_ANDROID_OPENSLES"
             ],
             "deps": [],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-aarch64-linux-android/gn-output/gen/"
+                "/home/dminor/src/fennec/obj-aarch64-linux-android/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/api/call/transport.h"
             ],
             "type": "source_set"
         },
         "//webrtc/api:video_frame_api": {
@@ -305,34 +302,33 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
                 "WEBRTC_ANDROID_OPENSLES"
             ],
             "deps": [
                 "//webrtc/base:rtc_base_approved",
                 "//webrtc/system_wrappers:system_wrappers"
             ],
             "include_dirs": [
                 "/media/libyuv/libyuv/include/",
                 "//",
-                "/home/dminor/src/fennec/obj-aarch64-linux-android/gn-output/gen/"
+                "/home/dminor/src/fennec/obj-aarch64-linux-android/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [
                 "log"
             ],
             "sources": [
                 "//webrtc/api/video/i420_buffer.cc",
                 "//webrtc/api/video/i420_buffer.h",
                 "//webrtc/api/video/video_frame.cc",
@@ -391,34 +387,33 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
                 "WEBRTC_ANDROID_OPENSLES"
             ],
             "deps": [
                 "//webrtc:webrtc_common",
                 "//webrtc/base:rtc_base_approved",
                 "//webrtc/modules/audio_coding:audio_format_conversion"
             ],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-aarch64-linux-android/gn-output/gen/"
+                "/home/dminor/src/fennec/obj-aarch64-linux-android/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [
                 "log"
             ],
             "sources": [
                 "//webrtc/audio/utility/audio_frame_operations.cc",
                 "//webrtc/audio/utility/audio_frame_operations.h"
             ],
@@ -473,17 +468,16 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
                 "WEBRTC_ANDROID_OPENSLES",
@@ -503,29 +497,28 @@
                 "//webrtc/modules/pacing:pacing",
                 "//webrtc/modules/remote_bitrate_estimator:remote_bitrate_estimator",
                 "//webrtc/modules/rtp_rtcp:rtp_rtcp",
                 "//webrtc/system_wrappers:system_wrappers",
                 "//webrtc/voice_engine:voice_engine"
             ],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-aarch64-linux-android/gn-output/gen/",
+                "/home/dminor/src/fennec/obj-aarch64-linux-android/media/webrtc/trunk/gn-output/gen/",
                 "//webrtc/common_audio/resampler/include/",
                 "//webrtc/common_audio/signal_processing/include/",
                 "//webrtc/common_audio/vad/include/",
                 "//webrtc/modules/include/",
                 "//webrtc/modules/audio_device/include/",
                 "//webrtc/modules/audio_device/dummy/",
                 "//webrtc/modules/audio_coding/include/",
                 "//webrtc/modules/include/"
             ],
             "libs": [
-                "log",
-                "OpenSLES"
+                "log"
             ],
             "sources": [
                 "//webrtc/audio/audio_receive_stream.cc",
                 "//webrtc/audio/audio_receive_stream.h",
                 "//webrtc/audio/audio_send_stream.cc",
                 "//webrtc/audio/audio_send_stream.h",
                 "//webrtc/audio/audio_state.cc",
                 "//webrtc/audio/audio_state.h",
@@ -585,30 +578,29 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
                 "WEBRTC_ANDROID_OPENSLES"
             ],
             "deps": [],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-aarch64-linux-android/gn-output/gen/"
+                "/home/dminor/src/fennec/obj-aarch64-linux-android/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/base/gtest_prod_util.h"
             ],
             "type": "source_set"
         },
         "//webrtc/base:rtc_base_approved": {
@@ -660,30 +652,29 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
                 "WEBRTC_ANDROID_OPENSLES"
             ],
             "deps": [],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-aarch64-linux-android/gn-output/gen/"
+                "/home/dminor/src/fennec/obj-aarch64-linux-android/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [
                 "log"
             ],
             "sources": [
                 "//webrtc/base/array_view.h",
                 "//webrtc/base/arraysize.h",
                 "//webrtc/base/atomicops.h",
@@ -823,32 +814,31 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
                 "WEBRTC_ANDROID_OPENSLES"
             ],
             "deps": [
                 "//webrtc/base:rtc_base_approved"
             ],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-aarch64-linux-android/gn-output/gen/"
+                "/home/dminor/src/fennec/obj-aarch64-linux-android/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [
                 "log"
             ],
             "sources": [
                 "//webrtc/base/numerics/exp_filter.cc",
                 "//webrtc/base/numerics/exp_filter.h",
                 "//webrtc/base/numerics/percentile_filter.h"
@@ -904,17 +894,16 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_BUILD_LIBEVENT",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
@@ -922,17 +911,17 @@
             ],
             "deps": [
                 "//webrtc/base:rtc_base_approved"
             ],
             "include_dirs": [
                 "/ipc/chromium/src/third_party/libevent/include/",
                 "/ipc/chromium/src/third_party/libevent/linux/",
                 "//",
-                "/home/dminor/src/fennec/obj-aarch64-linux-android/gn-output/gen/"
+                "/home/dminor/src/fennec/obj-aarch64-linux-android/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [
                 "log"
             ],
             "sources": [
                 "//webrtc/base/sequenced_task_checker.h",
                 "//webrtc/base/sequenced_task_checker_impl.cc",
                 "//webrtc/base/sequenced_task_checker_impl.h",
@@ -994,17 +983,16 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
                 "WEBRTC_ANDROID_OPENSLES",
@@ -1020,21 +1008,20 @@
                 "//webrtc/logging:rtc_event_log_impl",
                 "//webrtc/modules/congestion_controller:congestion_controller",
                 "//webrtc/modules/rtp_rtcp:rtp_rtcp",
                 "//webrtc/system_wrappers:system_wrappers",
                 "//webrtc/video:video"
             ],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-aarch64-linux-android/gn-output/gen/"
+                "/home/dminor/src/fennec/obj-aarch64-linux-android/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [
-                "log",
-                "OpenSLES"
+                "log"
             ],
             "sources": [
                 "//webrtc/call/bitrate_allocator.cc",
                 "//webrtc/call/call.cc",
                 "//webrtc/call/flexfec_receive_stream_impl.cc",
                 "//webrtc/call/flexfec_receive_stream_impl.h"
             ],
             "type": "static_library"
@@ -1088,30 +1075,29 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
                 "WEBRTC_ANDROID_OPENSLES"
             ],
             "deps": [],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-aarch64-linux-android/gn-output/gen/"
+                "/home/dminor/src/fennec/obj-aarch64-linux-android/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/call/audio_receive_stream.h",
                 "//webrtc/call/audio_send_stream.h",
                 "//webrtc/call/audio_state.h",
                 "//webrtc/call/call.h",
                 "//webrtc/call/flexfec_receive_stream.h",
@@ -1168,34 +1154,33 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
                 "WEBRTC_ANDROID_OPENSLES"
             ],
             "deps": [
                 "//webrtc/common_audio:common_audio_c",
                 "//webrtc/common_audio:common_audio_neon",
                 "//webrtc/system_wrappers:system_wrappers"
             ],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-aarch64-linux-android/gn-output/gen/",
+                "/home/dminor/src/fennec/obj-aarch64-linux-android/media/webrtc/trunk/gn-output/gen/",
                 "//webrtc/common_audio/resampler/include/",
                 "//webrtc/common_audio/signal_processing/include/",
                 "//webrtc/common_audio/vad/include/"
             ],
             "libs": [
                 "log"
             ],
             "sources": [
@@ -1291,30 +1276,29 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
                 "WEBRTC_ANDROID_OPENSLES"
             ],
             "deps": [],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-aarch64-linux-android/gn-output/gen/",
+                "/home/dminor/src/fennec/obj-aarch64-linux-android/media/webrtc/trunk/gn-output/gen/",
                 "//webrtc/common_audio/resampler/include/",
                 "//webrtc/common_audio/signal_processing/include/",
                 "//webrtc/common_audio/vad/include/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/common_audio/fft4g.c",
                 "//webrtc/common_audio/fft4g.h",
@@ -1421,32 +1405,31 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
                 "WEBRTC_ANDROID_OPENSLES"
             ],
             "deps": [
                 "//webrtc/common_audio:common_audio_neon_c"
             ],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-aarch64-linux-android/gn-output/gen/"
+                "/home/dminor/src/fennec/obj-aarch64-linux-android/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/common_audio/fir_filter_neon.cc",
                 "//webrtc/common_audio/resampler/sinc_resampler_neon.cc"
             ],
             "type": "static_library"
         },
@@ -1499,30 +1482,29 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
                 "WEBRTC_ANDROID_OPENSLES"
             ],
             "deps": [],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-aarch64-linux-android/gn-output/gen/"
+                "/home/dminor/src/fennec/obj-aarch64-linux-android/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/common_audio/signal_processing/cross_correlation_neon.c",
                 "//webrtc/common_audio/signal_processing/downsample_fast_neon.c",
                 "//webrtc/common_audio/signal_processing/min_max_operations_neon.c"
             ],
             "type": "source_set"
@@ -1576,17 +1558,16 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
                 "WEBRTC_ANDROID_OPENSLES",
@@ -1597,17 +1578,17 @@
                 "//webrtc/api:video_frame_api",
                 "//webrtc/base:rtc_task_queue",
                 "//webrtc/system_wrappers:system_wrappers"
             ],
             "include_dirs": [
                 "//webrtc/modules/interface/",
                 "/media/libyuv/libyuv/include/",
                 "//",
-                "/home/dminor/src/fennec/obj-aarch64-linux-android/gn-output/gen/",
+                "/home/dminor/src/fennec/obj-aarch64-linux-android/media/webrtc/trunk/gn-output/gen/",
                 "//webrtc/common_video/include/",
                 "//webrtc/common_video/libyuv/include/"
             ],
             "libs": [
                 "log"
             ],
             "sources": [
                 "//webrtc/common_video/bitrate_adjuster.cc",
@@ -1689,30 +1670,29 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
                 "WEBRTC_ANDROID_OPENSLES"
             ],
             "deps": [],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-aarch64-linux-android/gn-output/gen/"
+                "/home/dminor/src/fennec/obj-aarch64-linux-android/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/logging/rtc_event_log/rtc_event_log.h"
             ],
             "type": "source_set"
         },
         "//webrtc/logging:rtc_event_log_impl": {
@@ -1764,17 +1744,16 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
                 "WEBRTC_ANDROID_OPENSLES",
@@ -1783,17 +1762,17 @@
             "deps": [
                 "//webrtc:webrtc_common",
                 "//webrtc/call:call_interfaces",
                 "//webrtc/logging:rtc_event_log_api",
                 "//webrtc/modules/rtp_rtcp:rtp_rtcp"
             ],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-aarch64-linux-android/gn-output/gen/"
+                "/home/dminor/src/fennec/obj-aarch64-linux-android/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [
                 "log"
             ],
             "sources": [
                 "//webrtc/logging/rtc_event_log/ringbuffer.h",
                 "//webrtc/logging/rtc_event_log/rtc_event_log.cc",
                 "//webrtc/logging/rtc_event_log/rtc_event_log_helper_thread.cc",
@@ -1850,30 +1829,29 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
                 "WEBRTC_ANDROID_OPENSLES"
             ],
             "deps": [],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-aarch64-linux-android/gn-output/gen/"
+                "/home/dminor/src/fennec/obj-aarch64-linux-android/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/media/base/videoadapter.cc",
                 "//webrtc/media/base/videoadapter.h",
                 "//webrtc/media/base/videobroadcaster.cc",
                 "//webrtc/media/base/videobroadcaster.h",
                 "//webrtc/media/base/videosourcebase.cc",
@@ -1932,17 +1910,16 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
                 "WEBRTC_ANDROID_OPENSLES"
@@ -1962,17 +1939,17 @@
                 "//webrtc/modules/audio_coding:neteq",
                 "//webrtc/modules/audio_coding:pcm16b",
                 "//webrtc/modules/audio_coding:rent_a_codec",
                 "//webrtc/modules/audio_coding:webrtc_opus",
                 "//webrtc/system_wrappers:system_wrappers"
             ],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-aarch64-linux-android/gn-output/gen/",
+                "/home/dminor/src/fennec/obj-aarch64-linux-android/media/webrtc/trunk/gn-output/gen/",
                 "//webrtc/modules/audio_coding/include/",
                 "//webrtc/modules/include/",
                 "//",
                 "//webrtc/modules/audio_coding/codecs/cng/include/",
                 "//",
                 "//webrtc/modules/audio_coding/codecs/g711/include/",
                 "//",
                 "//webrtc/modules/audio_coding/codecs/pcm16b/include/",
@@ -2052,17 +2029,16 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
                 "WEBRTC_ANDROID_OPENSLES"
@@ -2070,17 +2046,17 @@
             "deps": [
                 "//webrtc/base:rtc_base_approved",
                 "//webrtc/modules/audio_coding:audio_decoder_interface",
                 "//webrtc/modules/audio_coding:audio_format",
                 "//webrtc/modules/audio_coding:audio_format_conversion"
             ],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-aarch64-linux-android/gn-output/gen/"
+                "/home/dminor/src/fennec/obj-aarch64-linux-android/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [
                 "log"
             ],
             "sources": [
                 "//webrtc/modules/audio_coding/codecs/audio_decoder_factory.h"
             ],
             "type": "source_set"
@@ -2134,33 +2110,32 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
                 "WEBRTC_ANDROID_OPENSLES"
             ],
             "deps": [
                 "//webrtc:webrtc_common",
                 "//webrtc/base:rtc_base_approved"
             ],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-aarch64-linux-android/gn-output/gen/"
+                "/home/dminor/src/fennec/obj-aarch64-linux-android/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [
                 "log"
             ],
             "sources": [
                 "//webrtc/modules/audio_coding/codecs/audio_decoder.cc",
                 "//webrtc/modules/audio_coding/codecs/audio_decoder.h",
                 "//webrtc/modules/audio_coding/codecs/legacy_encoded_audio_frame.cc",
@@ -2217,33 +2192,32 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
                 "WEBRTC_ANDROID_OPENSLES"
             ],
             "deps": [
                 "//webrtc:webrtc_common",
                 "//webrtc/base:rtc_base_approved"
             ],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-aarch64-linux-android/gn-output/gen/"
+                "/home/dminor/src/fennec/obj-aarch64-linux-android/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [
                 "log"
             ],
             "sources": [
                 "//webrtc/modules/audio_coding/codecs/audio_encoder.cc",
                 "//webrtc/modules/audio_coding/codecs/audio_encoder.h"
             ],
@@ -2298,32 +2272,31 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
                 "WEBRTC_ANDROID_OPENSLES"
             ],
             "deps": [
                 "//webrtc:webrtc_common"
             ],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-aarch64-linux-android/gn-output/gen/"
+                "/home/dminor/src/fennec/obj-aarch64-linux-android/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/modules/audio_coding/codecs/audio_format.cc",
                 "//webrtc/modules/audio_coding/codecs/audio_format.h"
             ],
             "type": "static_library"
         },
@@ -2376,34 +2349,33 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
                 "WEBRTC_ANDROID_OPENSLES"
             ],
             "deps": [
                 "//webrtc:webrtc_common",
                 "//webrtc/base:rtc_base_approved",
                 "//webrtc/modules/audio_coding:audio_format"
             ],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-aarch64-linux-android/gn-output/gen/"
+                "/home/dminor/src/fennec/obj-aarch64-linux-android/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [
                 "log"
             ],
             "sources": [
                 "//webrtc/modules/audio_coding/codecs/audio_format_conversion.cc",
                 "//webrtc/modules/audio_coding/codecs/audio_format_conversion.h"
             ],
@@ -2458,17 +2430,16 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
                 "WEBRTC_ANDROID_OPENSLES"
@@ -2476,17 +2447,17 @@
             "deps": [
                 "//webrtc:webrtc_common",
                 "//webrtc/base:rtc_base_approved",
                 "//webrtc/common_audio:common_audio",
                 "//webrtc/system_wrappers:system_wrappers"
             ],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-aarch64-linux-android/gn-output/gen/",
+                "/home/dminor/src/fennec/obj-aarch64-linux-android/media/webrtc/trunk/gn-output/gen/",
                 "//webrtc/common_audio/resampler/include/",
                 "//webrtc/common_audio/signal_processing/include/",
                 "//webrtc/common_audio/vad/include/"
             ],
             "libs": [
                 "log"
             ],
             "sources": [
@@ -2564,17 +2535,16 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
                 "WEBRTC_ANDROID_OPENSLES"
@@ -2587,17 +2557,17 @@
                 "//webrtc/modules/audio_coding:g711",
                 "//webrtc/modules/audio_coding:g722",
                 "//webrtc/modules/audio_coding:isac",
                 "//webrtc/modules/audio_coding:pcm16b",
                 "//webrtc/modules/audio_coding:webrtc_opus"
             ],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-aarch64-linux-android/gn-output/gen/",
+                "/home/dminor/src/fennec/obj-aarch64-linux-android/media/webrtc/trunk/gn-output/gen/",
                 "//",
                 "//webrtc/modules/audio_coding/codecs/cng/include/",
                 "//",
                 "//webrtc/modules/audio_coding/codecs/g711/include/",
                 "//",
                 "//webrtc/modules/audio_coding/codecs/pcm16b/include/",
                 "//",
                 "//webrtc/modules/audio_coding/codecs/isac/main/include/",
@@ -2662,17 +2632,16 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
                 "WEBRTC_ANDROID_OPENSLES"
@@ -2680,17 +2649,17 @@
             "deps": [
                 "//webrtc:webrtc_common",
                 "//webrtc/base:rtc_base_approved",
                 "//webrtc/common_audio:common_audio",
                 "//webrtc/modules/audio_coding:audio_encoder_interface"
             ],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-aarch64-linux-android/gn-output/gen/",
+                "/home/dminor/src/fennec/obj-aarch64-linux-android/media/webrtc/trunk/gn-output/gen/",
                 "//",
                 "//webrtc/modules/audio_coding/codecs/cng/include/",
                 "//webrtc/common_audio/resampler/include/",
                 "//webrtc/common_audio/signal_processing/include/",
                 "//webrtc/common_audio/vad/include/"
             ],
             "libs": [
                 "log"
@@ -2752,17 +2721,16 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
                 "WEBRTC_ANDROID_OPENSLES"
@@ -2771,17 +2739,17 @@
                 "//webrtc:webrtc_common",
                 "//webrtc/base:rtc_base_approved",
                 "//webrtc/modules/audio_coding:audio_decoder_interface",
                 "//webrtc/modules/audio_coding:audio_encoder_interface",
                 "//webrtc/modules/audio_coding:g711_c"
             ],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-aarch64-linux-android/gn-output/gen/",
+                "/home/dminor/src/fennec/obj-aarch64-linux-android/media/webrtc/trunk/gn-output/gen/",
                 "//",
                 "//webrtc/modules/audio_coding/codecs/g711/include/"
             ],
             "libs": [
                 "log"
             ],
             "sources": [
                 "//webrtc/modules/audio_coding/codecs/g711/audio_decoder_pcm.cc",
@@ -2840,32 +2808,31 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
                 "WEBRTC_ANDROID_OPENSLES"
             ],
             "deps": [
                 "//webrtc:webrtc_common"
             ],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-aarch64-linux-android/gn-output/gen/"
+                "/home/dminor/src/fennec/obj-aarch64-linux-android/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/modules/audio_coding/codecs/g711/g711.c",
                 "//webrtc/modules/audio_coding/codecs/g711/g711.h",
                 "//webrtc/modules/audio_coding/codecs/g711/g711_interface.c",
                 "//webrtc/modules/audio_coding/codecs/g711/g711_interface.h"
             ],
@@ -2920,17 +2887,16 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
                 "WEBRTC_ANDROID_OPENSLES"
@@ -2939,17 +2905,17 @@
                 "//webrtc:webrtc_common",
                 "//webrtc/base:rtc_base_approved",
                 "//webrtc/modules/audio_coding:audio_decoder_interface",
                 "//webrtc/modules/audio_coding:audio_encoder_interface",
                 "//webrtc/modules/audio_coding:g722_c"
             ],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-aarch64-linux-android/gn-output/gen/",
+                "/home/dminor/src/fennec/obj-aarch64-linux-android/media/webrtc/trunk/gn-output/gen/",
                 "//",
                 "//webrtc/modules/audio_coding/codecs/g722/include/"
             ],
             "libs": [
                 "log"
             ],
             "sources": [
                 "//webrtc/modules/audio_coding/codecs/g722/audio_decoder_g722.cc",
@@ -3008,32 +2974,31 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
                 "WEBRTC_ANDROID_OPENSLES"
             ],
             "deps": [
                 "//webrtc:webrtc_common"
             ],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-aarch64-linux-android/gn-output/gen/"
+                "/home/dminor/src/fennec/obj-aarch64-linux-android/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/modules/audio_coding/codecs/g722/g722_decode.c",
                 "//webrtc/modules/audio_coding/codecs/g722/g722_enc_dec.h",
                 "//webrtc/modules/audio_coding/codecs/g722/g722_encode.c",
                 "//webrtc/modules/audio_coding/codecs/g722/g722_interface.c",
                 "//webrtc/modules/audio_coding/codecs/g722/g722_interface.h"
@@ -3089,17 +3054,16 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
                 "WEBRTC_ANDROID_OPENSLES"
@@ -3107,17 +3071,17 @@
             "deps": [
                 "//webrtc/modules/audio_coding:audio_decoder_interface",
                 "//webrtc/modules/audio_coding:audio_encoder_interface",
                 "//webrtc/modules/audio_coding:isac_c",
                 "//webrtc/modules/audio_coding:isac_common"
             ],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-aarch64-linux-android/gn-output/gen/",
+                "/home/dminor/src/fennec/obj-aarch64-linux-android/media/webrtc/trunk/gn-output/gen/",
                 "//",
                 "//webrtc/modules/audio_coding/codecs/isac/main/include/"
             ],
             "libs": [
                 "log"
             ],
             "sources": [
                 "//webrtc/modules/audio_coding/codecs/isac/main/source/audio_decoder_isac.cc",
@@ -3174,17 +3138,16 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
                 "WEBRTC_ANDROID_OPENSLES"
@@ -3192,17 +3155,17 @@
             "deps": [
                 "//webrtc:webrtc_common",
                 "//webrtc/base:rtc_base_approved",
                 "//webrtc/common_audio:common_audio",
                 "//webrtc/modules/audio_coding:isac_common"
             ],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-aarch64-linux-android/gn-output/gen/",
+                "/home/dminor/src/fennec/obj-aarch64-linux-android/media/webrtc/trunk/gn-output/gen/",
                 "//",
                 "//webrtc/modules/audio_coding/codecs/isac/main/include/",
                 "//webrtc/common_audio/resampler/include/",
                 "//webrtc/common_audio/signal_processing/include/",
                 "//webrtc/common_audio/vad/include/"
             ],
             "libs": [
                 "log"
@@ -3312,33 +3275,32 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
                 "WEBRTC_ANDROID_OPENSLES"
             ],
             "deps": [
                 "//webrtc/base:rtc_base_approved",
                 "//webrtc/modules/audio_coding:audio_encoder_interface"
             ],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-aarch64-linux-android/gn-output/gen/"
+                "/home/dminor/src/fennec/obj-aarch64-linux-android/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [
                 "log"
             ],
             "sources": [
                 "//webrtc/modules/audio_coding/codecs/isac/audio_encoder_isac_t.h",
                 "//webrtc/modules/audio_coding/codecs/isac/audio_encoder_isac_t_impl.h",
                 "//webrtc/modules/audio_coding/codecs/isac/locked_bandwidth_info.cc",
@@ -3395,17 +3357,16 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
                 "WEBRTC_ANDROID_OPENSLES"
@@ -3416,17 +3377,17 @@
                 "//webrtc/modules/audio_coding:audio_encoder_interface",
                 "//webrtc/modules/audio_coding:isac_common",
                 "//webrtc/modules/audio_coding:isac_fix_c",
                 "//webrtc/modules/audio_coding:isac_neon",
                 "//webrtc/system_wrappers:system_wrappers"
             ],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-aarch64-linux-android/gn-output/gen/",
+                "/home/dminor/src/fennec/obj-aarch64-linux-android/media/webrtc/trunk/gn-output/gen/",
                 "//",
                 "//webrtc/modules/audio_coding/codecs/isac/fix/include/",
                 "//webrtc/common_audio/resampler/include/",
                 "//webrtc/common_audio/signal_processing/include/",
                 "//webrtc/common_audio/vad/include/"
             ],
             "libs": [
                 "log"
@@ -3486,17 +3447,16 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
                 "WEBRTC_ANDROID_OPENSLES"
@@ -3507,17 +3467,17 @@
                 "//webrtc/common_audio:common_audio",
                 "//webrtc/modules/audio_coding:audio_decoder_interface",
                 "//webrtc/modules/audio_coding:audio_encoder_interface",
                 "//webrtc/modules/audio_coding:isac_common",
                 "//webrtc/system_wrappers:system_wrappers"
             ],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-aarch64-linux-android/gn-output/gen/",
+                "/home/dminor/src/fennec/obj-aarch64-linux-android/media/webrtc/trunk/gn-output/gen/",
                 "//",
                 "//webrtc/modules/audio_coding/codecs/isac/fix/include/",
                 "//webrtc/common_audio/resampler/include/",
                 "//webrtc/common_audio/signal_processing/include/",
                 "//webrtc/common_audio/vad/include/"
             ],
             "libs": [
                 "log"
@@ -3621,34 +3581,33 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
                 "WEBRTC_ANDROID_OPENSLES"
             ],
             "deps": [
                 "//webrtc/base:rtc_base_approved",
                 "//webrtc/common_audio:common_audio",
                 "//webrtc/modules/audio_coding:isac_fix_c"
             ],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-aarch64-linux-android/gn-output/gen/",
+                "/home/dminor/src/fennec/obj-aarch64-linux-android/media/webrtc/trunk/gn-output/gen/",
                 "//",
                 "//webrtc/modules/audio_coding/codecs/isac/fix/include/",
                 "//webrtc/common_audio/resampler/include/",
                 "//webrtc/common_audio/signal_processing/include/",
                 "//webrtc/common_audio/vad/include/"
             ],
             "libs": [
                 "log"
@@ -3714,17 +3673,16 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
                 "WEBRTC_ANDROID_OPENSLES"
@@ -3745,17 +3703,17 @@
                 "//webrtc/modules/audio_coding:isac_fix",
                 "//webrtc/modules/audio_coding:pcm16b",
                 "//webrtc/modules/audio_coding:rent_a_codec",
                 "//webrtc/modules/audio_coding:webrtc_opus",
                 "//webrtc/system_wrappers:system_wrappers"
             ],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-aarch64-linux-android/gn-output/gen/",
+                "/home/dminor/src/fennec/obj-aarch64-linux-android/media/webrtc/trunk/gn-output/gen/",
                 "//",
                 "//webrtc/modules/audio_coding/codecs/cng/include/",
                 "//",
                 "//webrtc/modules/audio_coding/codecs/g711/include/",
                 "//",
                 "//webrtc/modules/audio_coding/codecs/isac/fix/include/",
                 "//",
                 "//webrtc/modules/audio_coding/codecs/pcm16b/include/",
@@ -3894,17 +3852,16 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
                 "WEBRTC_ANDROID_OPENSLES"
@@ -3914,17 +3871,17 @@
                 "//webrtc/base:rtc_base_approved",
                 "//webrtc/modules/audio_coding:audio_decoder_interface",
                 "//webrtc/modules/audio_coding:audio_encoder_interface",
                 "//webrtc/modules/audio_coding:g711",
                 "//webrtc/modules/audio_coding:pcm16b_c"
             ],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-aarch64-linux-android/gn-output/gen/",
+                "/home/dminor/src/fennec/obj-aarch64-linux-android/media/webrtc/trunk/gn-output/gen/",
                 "//",
                 "//webrtc/modules/audio_coding/codecs/pcm16b/include/",
                 "//",
                 "//webrtc/modules/audio_coding/codecs/g711/include/"
             ],
             "libs": [
                 "log"
             ],
@@ -3985,32 +3942,31 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
                 "WEBRTC_ANDROID_OPENSLES"
             ],
             "deps": [
                 "//webrtc:webrtc_common"
             ],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-aarch64-linux-android/gn-output/gen/",
+                "/home/dminor/src/fennec/obj-aarch64-linux-android/media/webrtc/trunk/gn-output/gen/",
                 "//",
                 "//webrtc/modules/audio_coding/codecs/pcm16b/include/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/modules/audio_coding/codecs/pcm16b/pcm16b.c",
                 "//webrtc/modules/audio_coding/codecs/pcm16b/pcm16b.h"
             ],
@@ -4067,17 +4023,16 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
                 "WEBRTC_ANDROID_OPENSLES"
@@ -4090,17 +4045,17 @@
                 "//webrtc/modules/audio_coding:g711",
                 "//webrtc/modules/audio_coding:g722",
                 "//webrtc/modules/audio_coding:isac",
                 "//webrtc/modules/audio_coding:pcm16b",
                 "//webrtc/modules/audio_coding:webrtc_opus"
             ],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-aarch64-linux-android/gn-output/gen/",
+                "/home/dminor/src/fennec/obj-aarch64-linux-android/media/webrtc/trunk/gn-output/gen/",
                 "//",
                 "//webrtc/modules/audio_coding/codecs/cng/include/",
                 "//",
                 "//webrtc/modules/audio_coding/codecs/g711/include/",
                 "//",
                 "//webrtc/modules/audio_coding/codecs/pcm16b/include/",
                 "//",
                 "//webrtc/modules/audio_coding/codecs/isac/main/include/",
@@ -4168,17 +4123,16 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
                 "WEBRTC_ANDROID_OPENSLES"
@@ -4192,17 +4146,17 @@
                 "//webrtc/modules/audio_coding:audio_encoder_interface",
                 "//webrtc/modules/audio_coding:audio_network_adaptor",
                 "//webrtc/modules/audio_coding:webrtc_opus_c",
                 "//webrtc/system_wrappers:system_wrappers"
             ],
             "include_dirs": [
                 "/include/opus/",
                 "//",
-                "/home/dminor/src/fennec/obj-aarch64-linux-android/gn-output/gen/",
+                "/home/dminor/src/fennec/obj-aarch64-linux-android/media/webrtc/trunk/gn-output/gen/",
                 "//webrtc/common_audio/resampler/include/",
                 "//webrtc/common_audio/signal_processing/include/",
                 "//webrtc/common_audio/vad/include/"
             ],
             "libs": [
                 "log"
             ],
             "sources": [
@@ -4262,34 +4216,33 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
                 "WEBRTC_ANDROID_OPENSLES"
             ],
             "deps": [
                 "//webrtc:webrtc_common",
                 "//webrtc/base:rtc_base_approved"
             ],
             "include_dirs": [
                 "/media/libopus/include/",
                 "//",
-                "/home/dminor/src/fennec/obj-aarch64-linux-android/gn-output/gen/"
+                "/home/dminor/src/fennec/obj-aarch64-linux-android/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [
                 "log"
             ],
             "sources": [
                 "//webrtc/modules/audio_coding/codecs/opus/opus_inst.h",
                 "//webrtc/modules/audio_coding/codecs/opus/opus_interface.c",
                 "//webrtc/modules/audio_coding/codecs/opus/opus_interface.h"
@@ -4345,17 +4298,16 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
                 "WEBRTC_ANDROID_OPENSLES"
@@ -4364,17 +4316,17 @@
                 "//webrtc:webrtc_common",
                 "//webrtc/audio/utility:audio_frame_operations",
                 "//webrtc/base:rtc_base_approved",
                 "//webrtc/modules/audio_processing:audio_processing",
                 "//webrtc/system_wrappers:system_wrappers"
             ],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-aarch64-linux-android/gn-output/gen/",
+                "/home/dminor/src/fennec/obj-aarch64-linux-android/media/webrtc/trunk/gn-output/gen/",
                 "//webrtc/modules/audio_conference_mixer/include/",
                 "//webrtc/modules/include/"
             ],
             "libs": [
                 "log"
             ],
             "sources": [
                 "//webrtc/modules/audio_conference_mixer/include/audio_conference_mixer.h",
@@ -4424,32 +4376,32 @@
                 "-Wno-missing-field-initializers",
                 "-Wno-strict-overflow",
                 "-fno-builtin-cos",
                 "-fno-builtin-sin",
                 "-fno-builtin-cosf",
                 "-fno-builtin-sinf"
             ],
             "defines": [
+                "WEBRTC_DUMMY_AUDIO_BUILD",
                 "V8_DEPRECATION_WARNINGS",
                 "USE_OPENSSL_CERTS=1",
                 "NO_TCMALLOC",
                 "DISABLE_NACL",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "ANDROID",
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
                 "WEBRTC_ANDROID_OPENSLES",
@@ -4460,31 +4412,27 @@
                 "//webrtc/base:rtc_base_approved",
                 "//webrtc/base:rtc_task_queue",
                 "//webrtc/common_audio:common_audio",
                 "//webrtc/modules/utility:utility",
                 "//webrtc/system_wrappers:system_wrappers"
             ],
             "include_dirs": [
                 "//webrtc/modules/audio_device/android/",
-                "/config/external/nspr/",
-                "/nsprpub/lib/ds/",
-                "/nsprpub/pr/include/",
                 "//",
-                "/home/dminor/src/fennec/obj-aarch64-linux-android/gn-output/gen/",
+                "/home/dminor/src/fennec/obj-aarch64-linux-android/media/webrtc/trunk/gn-output/gen/",
                 "//webrtc/modules/include/",
                 "//webrtc/modules/audio_device/include/",
                 "//webrtc/modules/audio_device/dummy/",
                 "//webrtc/common_audio/resampler/include/",
                 "//webrtc/common_audio/signal_processing/include/",
                 "//webrtc/common_audio/vad/include/"
             ],
             "libs": [
-                "log",
-                "OpenSLES"
+                "log"
             ],
             "sources": [
                 "//webrtc/modules/audio_device/audio_device_buffer.cc",
                 "//webrtc/modules/audio_device/audio_device_buffer.h",
                 "//webrtc/modules/audio_device/audio_device_config.h",
                 "//webrtc/modules/audio_device/audio_device_generic.cc",
                 "//webrtc/modules/audio_device/audio_device_generic.h",
                 "//webrtc/modules/audio_device/dummy/audio_device_dummy.cc",
@@ -4492,33 +4440,16 @@
                 "//webrtc/modules/audio_device/dummy/file_audio_device.cc",
                 "//webrtc/modules/audio_device/dummy/file_audio_device.h",
                 "//webrtc/modules/audio_device/fine_audio_buffer.cc",
                 "//webrtc/modules/audio_device/fine_audio_buffer.h",
                 "//webrtc/modules/audio_device/include/audio_device.h",
                 "//webrtc/modules/audio_device/include/audio_device_defines.h",
                 "//webrtc/modules/audio_device/opensl/single_rw_fifo.cc",
                 "//webrtc/modules/audio_device/opensl/single_rw_fifo.h",
-                "//webrtc/modules/audio_device/audio_device_impl.cc",
-                "//webrtc/modules/audio_device/audio_device_impl.h",
-                "//webrtc/modules/audio_device/android/audio_device_template.h",
-                "//webrtc/modules/audio_device/android/audio_manager.cc",
-                "//webrtc/modules/audio_device/android/audio_manager.h",
-                "//webrtc/modules/audio_device/android/audio_record_jni.cc",
-                "//webrtc/modules/audio_device/android/audio_record_jni.h",
-                "//webrtc/modules/audio_device/android/audio_track_jni.cc",
-                "//webrtc/modules/audio_device/android/audio_track_jni.h",
-                "//webrtc/modules/audio_device/android/build_info.cc",
-                "//webrtc/modules/audio_device/android/build_info.h",
-                "//webrtc/modules/audio_device/android/opensles_common.cc",
-                "//webrtc/modules/audio_device/android/opensles_common.h",
-                "//webrtc/modules/audio_device/android/opensles_player.cc",
-                "//webrtc/modules/audio_device/android/opensles_player.h",
-                "//webrtc/modules/audio_device/android/opensles_recorder.cc",
-                "//webrtc/modules/audio_device/android/opensles_recorder.h",
                 "//webrtc/modules/audio_device/dummy/file_audio_device_factory.cc",
                 "//webrtc/modules/audio_device/dummy/file_audio_device_factory.h"
             ],
             "type": "static_library"
         },
         "//webrtc/modules/audio_mixer:audio_frame_manipulator": {
             "cflags": [
                 "-fno-strict-aliasing",
@@ -4568,33 +4499,32 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
                 "WEBRTC_ANDROID_OPENSLES"
             ],
             "deps": [
                 "//webrtc/audio/utility:utility",
                 "//webrtc/base:rtc_base_approved"
             ],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-aarch64-linux-android/gn-output/gen/"
+                "/home/dminor/src/fennec/obj-aarch64-linux-android/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [
                 "log"
             ],
             "sources": [
                 "//webrtc/modules/audio_mixer/audio_frame_manipulator.cc",
                 "//webrtc/modules/audio_mixer/audio_frame_manipulator.h"
             ],
@@ -4649,17 +4579,16 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
                 "WEBRTC_ANDROID_OPENSLES"
@@ -4670,17 +4599,17 @@
                 "//webrtc/audio/utility:audio_frame_operations",
                 "//webrtc/base:rtc_base_approved",
                 "//webrtc/modules/audio_mixer:audio_frame_manipulator",
                 "//webrtc/modules/audio_processing:audio_processing",
                 "//webrtc/system_wrappers:system_wrappers"
             ],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-aarch64-linux-android/gn-output/gen/"
+                "/home/dminor/src/fennec/obj-aarch64-linux-android/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [
                 "log"
             ],
             "sources": [
                 "//webrtc/modules/audio_mixer/audio_mixer_impl.cc",
                 "//webrtc/modules/audio_mixer/audio_mixer_impl.h",
                 "//webrtc/modules/audio_mixer/default_output_rate_calculator.cc",
@@ -4741,17 +4670,16 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
                 "WEBRTC_ANDROID_OPENSLES"
@@ -4764,17 +4692,17 @@
                 "//webrtc/common_audio:common_audio",
                 "//webrtc/modules/audio_coding:isac",
                 "//webrtc/modules/audio_processing:audio_processing_c",
                 "//webrtc/modules/audio_processing:audio_processing_neon",
                 "//webrtc/system_wrappers:system_wrappers"
             ],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-aarch64-linux-android/gn-output/gen/",
+                "/home/dminor/src/fennec/obj-aarch64-linux-android/media/webrtc/trunk/gn-output/gen/",
                 "//",
                 "//webrtc/modules/audio_coding/codecs/isac/main/include/",
                 "//webrtc/common_audio/resampler/include/",
                 "//webrtc/common_audio/signal_processing/include/",
                 "//webrtc/common_audio/vad/include/"
             ],
             "libs": [
                 "log"
@@ -4982,17 +4910,16 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
                 "WEBRTC_ANDROID_OPENSLES"
@@ -5000,17 +4927,17 @@
             "deps": [
                 "//webrtc:webrtc_common",
                 "//webrtc/base:rtc_base_approved",
                 "//webrtc/common_audio:common_audio",
                 "//webrtc/system_wrappers:system_wrappers"
             ],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-aarch64-linux-android/gn-output/gen/",
+                "/home/dminor/src/fennec/obj-aarch64-linux-android/media/webrtc/trunk/gn-output/gen/",
                 "//webrtc/common_audio/resampler/include/",
                 "//webrtc/common_audio/signal_processing/include/",
                 "//webrtc/common_audio/vad/include/"
             ],
             "libs": [
                 "log"
             ],
             "sources": [
@@ -5078,33 +5005,32 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
                 "WEBRTC_ANDROID_OPENSLES"
             ],
             "deps": [
                 "//webrtc/common_audio:common_audio",
                 "//webrtc/modules/audio_processing:audio_processing_neon_c"
             ],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-aarch64-linux-android/gn-output/gen/",
+                "/home/dminor/src/fennec/obj-aarch64-linux-android/media/webrtc/trunk/gn-output/gen/",
                 "//webrtc/common_audio/resampler/include/",
                 "//webrtc/common_audio/signal_processing/include/",
                 "//webrtc/common_audio/vad/include/"
             ],
             "libs": [
                 "log"
             ],
             "sources": [
@@ -5164,33 +5090,32 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
                 "WEBRTC_ANDROID_OPENSLES"
             ],
             "deps": [
                 "//webrtc/base:rtc_base_approved",
                 "//webrtc/modules/audio_processing:audio_processing_c"
             ],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-aarch64-linux-android/gn-output/gen/"
+                "/home/dminor/src/fennec/obj-aarch64-linux-android/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [
                 "log"
             ],
             "sources": [
                 "//webrtc/modules/audio_processing/ns/nsx_core_neon.c"
             ],
             "type": "static_library"
@@ -5245,17 +5170,16 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
                 "WEBRTC_ANDROID_OPENSLES",
@@ -5263,17 +5187,17 @@
             ],
             "deps": [
                 "//webrtc/base:rtc_base_approved",
                 "//webrtc/modules/rtp_rtcp:rtp_rtcp",
                 "//webrtc/system_wrappers:system_wrappers"
             ],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-aarch64-linux-android/gn-output/gen/"
+                "/home/dminor/src/fennec/obj-aarch64-linux-android/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [
                 "log"
             ],
             "sources": [
                 "//webrtc/modules/bitrate_controller/bitrate_controller_impl.cc",
                 "//webrtc/modules/bitrate_controller/bitrate_controller_impl.h",
                 "//webrtc/modules/bitrate_controller/include/bitrate_controller.h",
@@ -5332,17 +5256,16 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
                 "WEBRTC_ANDROID_OPENSLES",
@@ -5356,17 +5279,17 @@
                 "//webrtc/modules/pacing:pacing",
                 "//webrtc/modules/remote_bitrate_estimator:remote_bitrate_estimator",
                 "//webrtc/modules/rtp_rtcp:rtp_rtcp",
                 "//webrtc/modules/utility:utility",
                 "//webrtc/system_wrappers:system_wrappers"
             ],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-aarch64-linux-android/gn-output/gen/"
+                "/home/dminor/src/fennec/obj-aarch64-linux-android/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [
                 "log"
             ],
             "sources": [
                 "//webrtc/modules/congestion_controller/congestion_controller.cc",
                 "//webrtc/modules/congestion_controller/delay_based_bwe.cc",
                 "//webrtc/modules/congestion_controller/delay_based_bwe.h",
@@ -5435,17 +5358,16 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
                 "WEBRTC_ANDROID_OPENSLES"
@@ -5453,17 +5375,17 @@
             "deps": [
                 "//webrtc:webrtc_common",
                 "//webrtc/base:rtc_base_approved",
                 "//webrtc/common_audio:common_audio",
                 "//webrtc/system_wrappers:system_wrappers"
             ],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-aarch64-linux-android/gn-output/gen/",
+                "/home/dminor/src/fennec/obj-aarch64-linux-android/media/webrtc/trunk/gn-output/gen/",
                 "//webrtc/common_audio/resampler/include/",
                 "//webrtc/common_audio/signal_processing/include/",
                 "//webrtc/common_audio/vad/include/"
             ],
             "libs": [
                 "log"
             ],
             "sources": [
@@ -5525,17 +5447,16 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
                 "WEBRTC_ANDROID_OPENSLES",
@@ -5544,17 +5465,17 @@
             "deps": [
                 "//webrtc:webrtc_common",
                 "//webrtc/base:rtc_base_approved",
                 "//webrtc/modules/rtp_rtcp:rtp_rtcp",
                 "//webrtc/system_wrappers:system_wrappers"
             ],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-aarch64-linux-android/gn-output/gen/"
+                "/home/dminor/src/fennec/obj-aarch64-linux-android/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [
                 "log"
             ],
             "sources": [
                 "//webrtc/modules/pacing/alr_detector.cc",
                 "//webrtc/modules/pacing/alr_detector.h",
                 "//webrtc/modules/pacing/bitrate_prober.cc",
@@ -5616,34 +5537,33 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
                 "WEBRTC_ANDROID_OPENSLES"
             ],
             "deps": [
                 "//webrtc:webrtc_common",
                 "//webrtc/base:rtc_base_approved",
                 "//webrtc/system_wrappers:system_wrappers"
             ],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-aarch64-linux-android/gn-output/gen/"
+                "/home/dminor/src/fennec/obj-aarch64-linux-android/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [
                 "log"
             ],
             "sources": [
                 "//webrtc/modules/remote_bitrate_estimator/aimd_rate_control.cc",
                 "//webrtc/modules/remote_bitrate_estimator/aimd_rate_control.h",
                 "//webrtc/modules/remote_bitrate_estimator/bwe_defines.cc",
@@ -5717,17 +5637,16 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
                 "WEBRTC_ANDROID_OPENSLES",
@@ -5742,17 +5661,17 @@
                 "//webrtc/call:call_interfaces",
                 "//webrtc/common_video:common_video",
                 "//webrtc/logging:rtc_event_log_api",
                 "//webrtc/modules/remote_bitrate_estimator:remote_bitrate_estimator",
                 "//webrtc/system_wrappers:system_wrappers"
             ],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-aarch64-linux-android/gn-output/gen/",
+                "/home/dminor/src/fennec/obj-aarch64-linux-android/media/webrtc/trunk/gn-output/gen/",
                 "//webrtc/common_video/include/",
                 "//webrtc/common_video/libyuv/include/"
             ],
             "libs": [
                 "log"
             ],
             "sources": [
                 "//webrtc/modules/rtp_rtcp/include/flexfec_receiver.h",
@@ -5956,17 +5875,16 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
                 "WEBRTC_ANDROID_OPENSLES",
@@ -5981,17 +5899,17 @@
                 "//webrtc/modules/audio_coding:audio_format_conversion",
                 "//webrtc/modules/audio_coding:builtin_audio_decoder_factory",
                 "//webrtc/modules/audio_coding:rent_a_codec",
                 "//webrtc/modules/media_file:media_file",
                 "//webrtc/system_wrappers:system_wrappers"
             ],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-aarch64-linux-android/gn-output/gen/",
+                "/home/dminor/src/fennec/obj-aarch64-linux-android/media/webrtc/trunk/gn-output/gen/",
                 "//webrtc/common_audio/resampler/include/",
                 "//webrtc/common_audio/signal_processing/include/",
                 "//webrtc/common_audio/vad/include/",
                 "//webrtc/modules/audio_coding/include/",
                 "//webrtc/modules/include/"
             ],
             "libs": [
                 "log"
@@ -6057,17 +5975,16 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
                 "WEBRTC_ANDROID_OPENSLES",
@@ -6078,17 +5995,17 @@
                 "//webrtc/modules/video_capture:video_capture_module",
                 "//webrtc/system_wrappers:system_wrappers"
             ],
             "include_dirs": [
                 "/config/external/nspr/",
                 "/nsprpub/lib/ds/",
                 "/nsprpub/pr/include/",
                 "//",
-                "/home/dminor/src/fennec/obj-aarch64-linux-android/gn-output/gen/"
+                "/home/dminor/src/fennec/obj-aarch64-linux-android/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [
                 "log"
             ],
             "sources": [
                 "//webrtc/modules/video_capture/android/device_info_android.cc",
                 "//webrtc/modules/video_capture/android/video_capture_android.cc"
             ],
@@ -6143,17 +6060,16 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
                 "WEBRTC_ANDROID_OPENSLES",
@@ -6163,17 +6079,17 @@
                 "//webrtc:webrtc_common",
                 "//webrtc/base:rtc_base_approved",
                 "//webrtc/common_video:common_video",
                 "//webrtc/modules/utility:utility",
                 "//webrtc/system_wrappers:system_wrappers"
             ],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-aarch64-linux-android/gn-output/gen/",
+                "/home/dminor/src/fennec/obj-aarch64-linux-android/media/webrtc/trunk/gn-output/gen/",
                 "//webrtc/common_video/include/",
                 "//webrtc/common_video/libyuv/include/"
             ],
             "libs": [
                 "log"
             ],
             "sources": [
                 "//webrtc/modules/video_capture/device_info_impl.cc",
@@ -6238,17 +6154,16 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
                 "WEBRTC_ANDROID_OPENSLES",
@@ -6266,17 +6181,17 @@
                 "//webrtc/modules/video_coding:webrtc_h264",
                 "//webrtc/modules/video_coding:webrtc_i420",
                 "//webrtc/modules/video_coding:webrtc_vp8",
                 "//webrtc/modules/video_coding:webrtc_vp9",
                 "//webrtc/system_wrappers:system_wrappers"
             ],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-aarch64-linux-android/gn-output/gen/",
+                "/home/dminor/src/fennec/obj-aarch64-linux-android/media/webrtc/trunk/gn-output/gen/",
                 "//webrtc/common_video/include/",
                 "//webrtc/common_video/libyuv/include/"
             ],
             "libs": [
                 "log"
             ],
             "sources": [
                 "//webrtc/modules/video_coding/codec_database.cc",
@@ -6397,17 +6312,16 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
                 "WEBRTC_ANDROID_OPENSLES",
@@ -6417,17 +6331,17 @@
                 "//webrtc:webrtc_common",
                 "//webrtc/base:rtc_base_approved",
                 "//webrtc/base:rtc_numerics",
                 "//webrtc/common_video:common_video",
                 "//webrtc/system_wrappers:system_wrappers"
             ],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-aarch64-linux-android/gn-output/gen/",
+                "/home/dminor/src/fennec/obj-aarch64-linux-android/media/webrtc/trunk/gn-output/gen/",
                 "//webrtc/common_video/include/",
                 "//webrtc/common_video/libyuv/include/"
             ],
             "libs": [
                 "log"
             ],
             "sources": [
                 "//webrtc/modules/video_coding/utility/default_video_bitrate_allocator.cc",
@@ -6498,17 +6412,16 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
                 "WEBRTC_ANDROID_OPENSLES",
@@ -6516,17 +6429,17 @@
             ],
             "deps": [
                 "//webrtc/base:rtc_base_approved",
                 "//webrtc/modules/video_coding:video_coding_utility",
                 "//webrtc/system_wrappers:system_wrappers"
             ],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-aarch64-linux-android/gn-output/gen/"
+                "/home/dminor/src/fennec/obj-aarch64-linux-android/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [
                 "log"
             ],
             "sources": [
                 "//webrtc/modules/video_coding/codecs/h264/h264.cc",
                 "//webrtc/modules/video_coding/codecs/h264/include/h264.h"
             ],
@@ -6581,17 +6494,16 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
                 "WEBRTC_ANDROID_OPENSLES",
@@ -6600,17 +6512,17 @@
             "deps": [
                 "//webrtc:webrtc_common",
                 "//webrtc/base:rtc_base_approved",
                 "//webrtc/common_video:common_video",
                 "//webrtc/system_wrappers:system_wrappers"
             ],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-aarch64-linux-android/gn-output/gen/",
+                "/home/dminor/src/fennec/obj-aarch64-linux-android/media/webrtc/trunk/gn-output/gen/",
                 "//webrtc/common_video/include/",
                 "//webrtc/common_video/libyuv/include/"
             ],
             "libs": [
                 "log"
             ],
             "sources": [
                 "//webrtc/modules/video_coding/codecs/i420/i420.cc",
@@ -6667,17 +6579,16 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
                 "WEBRTC_ANDROID_OPENSLES",
@@ -6688,17 +6599,17 @@
                 "//webrtc/base:rtc_base_approved",
                 "//webrtc/common_video:common_video",
                 "//webrtc/modules/video_coding:video_coding_utility",
                 "//webrtc/system_wrappers:system_wrappers"
             ],
             "include_dirs": [
                 "/media/libyuv/libyuv/include/",
                 "//",
-                "/home/dminor/src/fennec/obj-aarch64-linux-android/gn-output/gen/",
+                "/home/dminor/src/fennec/obj-aarch64-linux-android/media/webrtc/trunk/gn-output/gen/",
                 "//webrtc/common_video/include/",
                 "//webrtc/common_video/libyuv/include/"
             ],
             "libs": [
                 "log"
             ],
             "sources": [
                 "//webrtc/modules/video_coding/codecs/vp8/default_temporal_layers.cc",
@@ -6767,17 +6678,16 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
                 "WEBRTC_ANDROID_OPENSLES",
@@ -6786,17 +6696,17 @@
             "deps": [
                 "//webrtc/base:rtc_base_approved",
                 "//webrtc/common_video:common_video",
                 "//webrtc/modules/video_coding:video_coding_utility",
                 "//webrtc/system_wrappers:system_wrappers"
             ],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-aarch64-linux-android/gn-output/gen/",
+                "/home/dminor/src/fennec/obj-aarch64-linux-android/media/webrtc/trunk/gn-output/gen/",
                 "//webrtc/common_video/include/",
                 "//webrtc/common_video/libyuv/include/"
             ],
             "libs": [
                 "log"
             ],
             "sources": [
                 "//webrtc/modules/video_coding/codecs/vp9/include/vp9.h",
@@ -6858,17 +6768,16 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
                 "WEBRTC_ANDROID_OPENSLES",
@@ -6880,17 +6789,17 @@
                 "//webrtc/common_video:common_video",
                 "//webrtc/modules/utility:utility",
                 "//webrtc/modules/video_processing:video_processing_neon",
                 "//webrtc/system_wrappers:system_wrappers"
             ],
             "include_dirs": [
                 "/media/libyuv/libyuv/include/",
                 "//",
-                "/home/dminor/src/fennec/obj-aarch64-linux-android/gn-output/gen/",
+                "/home/dminor/src/fennec/obj-aarch64-linux-android/media/webrtc/trunk/gn-output/gen/",
                 "//webrtc/common_audio/resampler/include/",
                 "//webrtc/common_audio/signal_processing/include/",
                 "//webrtc/common_audio/vad/include/",
                 "//webrtc/common_video/include/",
                 "//webrtc/common_video/libyuv/include/"
             ],
             "libs": [
                 "log"
@@ -6958,30 +6867,29 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
                 "WEBRTC_ANDROID_OPENSLES"
             ],
             "deps": [],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-aarch64-linux-android/gn-output/gen/"
+                "/home/dminor/src/fennec/obj-aarch64-linux-android/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/modules/video_processing/util/denoiser_filter_neon.cc",
                 "//webrtc/modules/video_processing/util/denoiser_filter_neon.h"
             ],
             "type": "static_library"
         },
@@ -7034,30 +6942,29 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
                 "WEBRTC_ANDROID_OPENSLES"
             ],
             "deps": [],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-aarch64-linux-android/gn-output/gen/"
+                "/home/dminor/src/fennec/obj-aarch64-linux-android/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/system_wrappers/include/field_trial_default.h",
                 "//webrtc/system_wrappers/source/field_trial_default.cc"
             ],
             "type": "static_library"
         },
@@ -7110,30 +7017,29 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
                 "WEBRTC_ANDROID_OPENSLES"
             ],
             "deps": [],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-aarch64-linux-android/gn-output/gen/"
+                "/home/dminor/src/fennec/obj-aarch64-linux-android/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/system_wrappers/include/metrics_default.h",
                 "//webrtc/system_wrappers/source/metrics_default.cc"
             ],
             "type": "static_library"
         },
@@ -7187,17 +7093,16 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
                 "WEBRTC_ANDROID_OPENSLES"
@@ -7206,17 +7111,17 @@
                 "//webrtc:webrtc_common",
                 "//webrtc/base:rtc_base_approved"
             ],
             "include_dirs": [
                 "/config/external/nspr/",
                 "/nsprpub/lib/ds/",
                 "/nsprpub/pr/include/",
                 "//",
-                "/home/dminor/src/fennec/obj-aarch64-linux-android/gn-output/gen/"
+                "/home/dminor/src/fennec/obj-aarch64-linux-android/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [
                 "log"
             ],
             "sources": [
                 "//webrtc/system_wrappers/include/aligned_array.h",
                 "//webrtc/system_wrappers/include/aligned_malloc.h",
                 "//webrtc/system_wrappers/include/atomic32.h",
@@ -7311,17 +7216,16 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
                 "WEBRTC_ANDROID_OPENSLES",
@@ -7343,25 +7247,24 @@
                 "//webrtc/modules/utility:utility",
                 "//webrtc/modules/video_coding:video_coding",
                 "//webrtc/modules/video_processing:video_processing",
                 "//webrtc/system_wrappers:system_wrappers",
                 "//webrtc/voice_engine:voice_engine"
             ],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-aarch64-linux-android/gn-output/gen/",
+                "/home/dminor/src/fennec/obj-aarch64-linux-android/media/webrtc/trunk/gn-output/gen/",
                 "//webrtc/common_video/include/",
                 "//webrtc/common_video/libyuv/include/",
                 "//webrtc/modules/audio_coding/include/",
                 "//webrtc/modules/include/"
             ],
             "libs": [
-                "log",
-                "OpenSLES"
+                "log"
             ],
             "sources": [
                 "//webrtc/video/call_stats.cc",
                 "//webrtc/video/call_stats.h",
                 "//webrtc/video/encoder_rtcp_feedback.cc",
                 "//webrtc/video/encoder_rtcp_feedback.h",
                 "//webrtc/video/overuse_frame_detector.cc",
                 "//webrtc/video/overuse_frame_detector.h",
@@ -7449,17 +7352,16 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
                 "WEBRTC_ANDROID_OPENSLES"
@@ -7468,17 +7370,17 @@
                 "//webrtc:webrtc_common",
                 "//webrtc/modules/audio_coding:audio_coding",
                 "//webrtc/modules/audio_coding:audio_format_conversion",
                 "//webrtc/modules/audio_coding:builtin_audio_decoder_factory",
                 "//webrtc/modules/audio_coding:rent_a_codec"
             ],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-aarch64-linux-android/gn-output/gen/",
+                "/home/dminor/src/fennec/obj-aarch64-linux-android/media/webrtc/trunk/gn-output/gen/",
                 "//webrtc/modules/audio_coding/include/",
                 "//webrtc/modules/include/"
             ],
             "libs": [
                 "log"
             ],
             "sources": [
                 "//webrtc/voice_engine/coder.cc",
@@ -7535,17 +7437,16 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
                 "WEBRTC_ANDROID_OPENSLES"
@@ -7554,17 +7455,17 @@
                 "//webrtc:webrtc_common",
                 "//webrtc/common_audio:common_audio",
                 "//webrtc/modules/media_file:media_file",
                 "//webrtc/system_wrappers:system_wrappers",
                 "//webrtc/voice_engine:audio_coder"
             ],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-aarch64-linux-android/gn-output/gen/",
+                "/home/dminor/src/fennec/obj-aarch64-linux-android/media/webrtc/trunk/gn-output/gen/",
                 "//webrtc/common_audio/resampler/include/",
                 "//webrtc/common_audio/signal_processing/include/",
                 "//webrtc/common_audio/vad/include/"
             ],
             "libs": [
                 "log"
             ],
             "sources": [
@@ -7622,17 +7523,16 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
                 "WEBRTC_ANDROID_OPENSLES"
@@ -7642,17 +7542,17 @@
                 "//webrtc/base:rtc_base_approved",
                 "//webrtc/common_audio:common_audio",
                 "//webrtc/modules/media_file:media_file",
                 "//webrtc/system_wrappers:system_wrappers",
                 "//webrtc/voice_engine:audio_coder"
             ],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-aarch64-linux-android/gn-output/gen/",
+                "/home/dminor/src/fennec/obj-aarch64-linux-android/media/webrtc/trunk/gn-output/gen/",
                 "//webrtc/common_audio/resampler/include/",
                 "//webrtc/common_audio/signal_processing/include/",
                 "//webrtc/common_audio/vad/include/"
             ],
             "libs": [
                 "log"
             ],
             "sources": [
@@ -7710,34 +7610,33 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
                 "WEBRTC_ANDROID_OPENSLES"
             ],
             "deps": [
                 "//webrtc:webrtc_common",
                 "//webrtc/base:rtc_base_approved",
                 "//webrtc/common_audio:common_audio"
             ],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-aarch64-linux-android/gn-output/gen/",
+                "/home/dminor/src/fennec/obj-aarch64-linux-android/media/webrtc/trunk/gn-output/gen/",
                 "//webrtc/common_audio/resampler/include/",
                 "//webrtc/common_audio/signal_processing/include/",
                 "//webrtc/common_audio/vad/include/"
             ],
             "libs": [
                 "log"
             ],
             "sources": [
@@ -7795,17 +7694,16 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
                 "WEBRTC_ANDROID_OPENSLES",
@@ -7835,31 +7733,30 @@
                 "//webrtc/modules/utility:utility",
                 "//webrtc/system_wrappers:system_wrappers",
                 "//webrtc/voice_engine:file_player",
                 "//webrtc/voice_engine:file_recorder",
                 "//webrtc/voice_engine:level_indicator"
             ],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-aarch64-linux-android/gn-output/gen/",
+                "/home/dminor/src/fennec/obj-aarch64-linux-android/media/webrtc/trunk/gn-output/gen/",
                 "//webrtc/modules/audio_coding/include/",
                 "//webrtc/modules/include/",
                 "//webrtc/common_audio/resampler/include/",
                 "//webrtc/common_audio/signal_processing/include/",
                 "//webrtc/common_audio/vad/include/",
                 "//webrtc/modules/audio_conference_mixer/include/",
                 "//webrtc/modules/include/",
                 "//webrtc/modules/include/",
                 "//webrtc/modules/audio_device/include/",
                 "//webrtc/modules/audio_device/dummy/"
             ],
             "libs": [
-                "log",
-                "OpenSLES"
+                "log"
             ],
             "sources": [
                 "//webrtc/voice_engine/channel.cc",
                 "//webrtc/voice_engine/channel.h",
                 "//webrtc/voice_engine/channel_manager.cc",
                 "//webrtc/voice_engine/channel_manager.h",
                 "//webrtc/voice_engine/channel_proxy.cc",
                 "//webrtc/voice_engine/channel_proxy.h",
@@ -7964,17 +7861,16 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
                 "WEBRTC_ANDROID_OPENSLES",
@@ -7996,33 +7892,32 @@
                 "//webrtc/system_wrappers:field_trial_default",
                 "//webrtc/system_wrappers:metrics_default",
                 "//webrtc/system_wrappers:system_wrappers",
                 "//webrtc/video:video",
                 "//webrtc/voice_engine:voice_engine"
             ],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-aarch64-linux-android/gn-output/gen/",
+                "/home/dminor/src/fennec/obj-aarch64-linux-android/media/webrtc/trunk/gn-output/gen/",
                 "//webrtc/common_audio/resampler/include/",
                 "//webrtc/common_audio/signal_processing/include/",
                 "//webrtc/common_audio/vad/include/",
                 "//webrtc/common_video/include/",
                 "//webrtc/common_video/libyuv/include/",
                 "//webrtc/modules/audio_coding/include/",
                 "//webrtc/modules/include/",
                 "//webrtc/modules/audio_conference_mixer/include/",
                 "//webrtc/modules/include/",
                 "//webrtc/modules/include/",
                 "//webrtc/modules/audio_device/include/",
                 "//webrtc/modules/audio_device/dummy/"
             ],
             "libs": [
-                "log",
-                "OpenSLES"
+                "log"
             ],
             "sources": [
                 "//webrtc/build/no_op_function.cc",
                 "//webrtc/call.h",
                 "//webrtc/config.h"
             ],
             "type": "static_library"
         },
@@ -8075,30 +7970,29 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM64",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
                 "WEBRTC_ANDROID_OPENSLES"
             ],
             "deps": [],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-aarch64-linux-android/gn-output/gen/"
+                "/home/dminor/src/fennec/obj-aarch64-linux-android/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/common_types.cc",
                 "//webrtc/common_types.h",
                 "//webrtc/config.cc",
                 "//webrtc/config.h",
                 "//webrtc/typedefs.h"
--- a/media/webrtc/gn-configs/x64_False_arm_android.json
+++ b/media/webrtc/gn-configs/x64_False_arm_android.json
@@ -76,33 +76,32 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM",
                 "WEBRTC_ARCH_ARM_V7",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
                 "WEBRTC_ANDROID_OPENSLES"
             ],
             "deps": [
                 "//webrtc/base:rtc_base_approved"
             ],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-arm-linux-androideabi/gn-output/gen/"
+                "/home/dminor/src/fennec/obj-arm-linux-androideabi/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [
                 "log"
             ],
             "sources": [
                 "//webrtc/api/audio/audio_mixer.h"
             ],
             "type": "source_set"
@@ -165,17 +164,16 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM",
                 "WEBRTC_ARCH_ARM_V7",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
@@ -186,17 +184,17 @@
                 "//webrtc/api:audio_mixer_api",
                 "//webrtc/api:transport_api",
                 "//webrtc/base:rtc_base_approved",
                 "//webrtc/modules/audio_coding:audio_decoder_factory_interface",
                 "//webrtc/modules/audio_coding:audio_encoder_interface"
             ],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-arm-linux-androideabi/gn-output/gen/"
+                "/home/dminor/src/fennec/obj-arm-linux-androideabi/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [
                 "log"
             ],
             "sources": [
                 "//webrtc/api/call/audio_sink.h"
             ],
             "type": "source_set"
@@ -259,31 +257,30 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM",
                 "WEBRTC_ARCH_ARM_V7",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
                 "WEBRTC_ANDROID_OPENSLES"
             ],
             "deps": [],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-arm-linux-androideabi/gn-output/gen/"
+                "/home/dminor/src/fennec/obj-arm-linux-androideabi/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/api/call/transport.h"
             ],
             "type": "source_set"
         },
         "//webrtc/api:video_frame_api": {
@@ -344,17 +341,16 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM",
                 "WEBRTC_ARCH_ARM_V7",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
@@ -362,17 +358,17 @@
             ],
             "deps": [
                 "//webrtc/base:rtc_base_approved",
                 "//webrtc/system_wrappers:system_wrappers"
             ],
             "include_dirs": [
                 "/media/libyuv/libyuv/include/",
                 "//",
-                "/home/dminor/src/fennec/obj-arm-linux-androideabi/gn-output/gen/"
+                "/home/dminor/src/fennec/obj-arm-linux-androideabi/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [
                 "log"
             ],
             "sources": [
                 "//webrtc/api/video/i420_buffer.cc",
                 "//webrtc/api/video/i420_buffer.h",
                 "//webrtc/api/video/video_frame.cc",
@@ -440,17 +436,16 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM",
                 "WEBRTC_ARCH_ARM_V7",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
@@ -458,17 +453,17 @@
             ],
             "deps": [
                 "//webrtc:webrtc_common",
                 "//webrtc/base:rtc_base_approved",
                 "//webrtc/modules/audio_coding:audio_format_conversion"
             ],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-arm-linux-androideabi/gn-output/gen/"
+                "/home/dminor/src/fennec/obj-arm-linux-androideabi/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [
                 "log"
             ],
             "sources": [
                 "//webrtc/audio/utility/audio_frame_operations.cc",
                 "//webrtc/audio/utility/audio_frame_operations.h"
             ],
@@ -532,17 +527,16 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM",
                 "WEBRTC_ARCH_ARM_V7",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
@@ -563,29 +557,28 @@
                 "//webrtc/modules/pacing:pacing",
                 "//webrtc/modules/remote_bitrate_estimator:remote_bitrate_estimator",
                 "//webrtc/modules/rtp_rtcp:rtp_rtcp",
                 "//webrtc/system_wrappers:system_wrappers",
                 "//webrtc/voice_engine:voice_engine"
             ],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-arm-linux-androideabi/gn-output/gen/",
+                "/home/dminor/src/fennec/obj-arm-linux-androideabi/media/webrtc/trunk/gn-output/gen/",
                 "//webrtc/common_audio/resampler/include/",
                 "//webrtc/common_audio/signal_processing/include/",
                 "//webrtc/common_audio/vad/include/",
                 "//webrtc/modules/include/",
                 "//webrtc/modules/audio_device/include/",
                 "//webrtc/modules/audio_device/dummy/",
                 "//webrtc/modules/audio_coding/include/",
                 "//webrtc/modules/include/"
             ],
             "libs": [
-                "log",
-                "OpenSLES"
+                "log"
             ],
             "sources": [
                 "//webrtc/audio/audio_receive_stream.cc",
                 "//webrtc/audio/audio_receive_stream.h",
                 "//webrtc/audio/audio_send_stream.cc",
                 "//webrtc/audio/audio_send_stream.h",
                 "//webrtc/audio/audio_state.cc",
                 "//webrtc/audio/audio_state.h",
@@ -654,31 +647,30 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM",
                 "WEBRTC_ARCH_ARM_V7",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
                 "WEBRTC_ANDROID_OPENSLES"
             ],
             "deps": [],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-arm-linux-androideabi/gn-output/gen/"
+                "/home/dminor/src/fennec/obj-arm-linux-androideabi/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/base/gtest_prod_util.h"
             ],
             "type": "source_set"
         },
         "//webrtc/base:rtc_base_approved": {
@@ -739,31 +731,30 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM",
                 "WEBRTC_ARCH_ARM_V7",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
                 "WEBRTC_ANDROID_OPENSLES"
             ],
             "deps": [],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-arm-linux-androideabi/gn-output/gen/"
+                "/home/dminor/src/fennec/obj-arm-linux-androideabi/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [
                 "log"
             ],
             "sources": [
                 "//webrtc/base/array_view.h",
                 "//webrtc/base/arraysize.h",
                 "//webrtc/base/atomicops.h",
@@ -912,33 +903,32 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM",
                 "WEBRTC_ARCH_ARM_V7",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
                 "WEBRTC_ANDROID_OPENSLES"
             ],
             "deps": [
                 "//webrtc/base:rtc_base_approved"
             ],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-arm-linux-androideabi/gn-output/gen/"
+                "/home/dminor/src/fennec/obj-arm-linux-androideabi/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [
                 "log"
             ],
             "sources": [
                 "//webrtc/base/numerics/exp_filter.cc",
                 "//webrtc/base/numerics/exp_filter.h",
                 "//webrtc/base/numerics/percentile_filter.h"
@@ -1003,17 +993,16 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM",
                 "WEBRTC_ARCH_ARM_V7",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_BUILD_LIBEVENT",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
@@ -1022,17 +1011,17 @@
             ],
             "deps": [
                 "//webrtc/base:rtc_base_approved"
             ],
             "include_dirs": [
                 "/ipc/chromium/src/third_party/libevent/include/",
                 "/ipc/chromium/src/third_party/libevent/linux/",
                 "//",
-                "/home/dminor/src/fennec/obj-arm-linux-androideabi/gn-output/gen/"
+                "/home/dminor/src/fennec/obj-arm-linux-androideabi/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [
                 "log"
             ],
             "sources": [
                 "//webrtc/base/sequenced_task_checker.h",
                 "//webrtc/base/sequenced_task_checker_impl.cc",
                 "//webrtc/base/sequenced_task_checker_impl.h",
@@ -1103,17 +1092,16 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM",
                 "WEBRTC_ARCH_ARM_V7",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
@@ -1130,21 +1118,20 @@
                 "//webrtc/logging:rtc_event_log_impl",
                 "//webrtc/modules/congestion_controller:congestion_controller",
                 "//webrtc/modules/rtp_rtcp:rtp_rtcp",
                 "//webrtc/system_wrappers:system_wrappers",
                 "//webrtc/video:video"
             ],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-arm-linux-androideabi/gn-output/gen/"
+                "/home/dminor/src/fennec/obj-arm-linux-androideabi/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [
-                "log",
-                "OpenSLES"
+                "log"
             ],
             "sources": [
                 "//webrtc/call/bitrate_allocator.cc",
                 "//webrtc/call/call.cc",
                 "//webrtc/call/flexfec_receive_stream_impl.cc",
                 "//webrtc/call/flexfec_receive_stream_impl.h"
             ],
             "type": "static_library"
@@ -1207,31 +1194,30 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM",
                 "WEBRTC_ARCH_ARM_V7",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
                 "WEBRTC_ANDROID_OPENSLES"
             ],
             "deps": [],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-arm-linux-androideabi/gn-output/gen/"
+                "/home/dminor/src/fennec/obj-arm-linux-androideabi/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/call/audio_receive_stream.h",
                 "//webrtc/call/audio_send_stream.h",
                 "//webrtc/call/audio_state.h",
                 "//webrtc/call/call.h",
                 "//webrtc/call/flexfec_receive_stream.h",
@@ -1297,17 +1283,16 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM",
                 "WEBRTC_ARCH_ARM_V7",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
@@ -1315,17 +1300,17 @@
             ],
             "deps": [
                 "//webrtc/common_audio:common_audio_c",
                 "//webrtc/common_audio:common_audio_neon",
                 "//webrtc/system_wrappers:system_wrappers"
             ],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-arm-linux-androideabi/gn-output/gen/",
+                "/home/dminor/src/fennec/obj-arm-linux-androideabi/media/webrtc/trunk/gn-output/gen/",
                 "//webrtc/common_audio/resampler/include/",
                 "//webrtc/common_audio/signal_processing/include/",
                 "//webrtc/common_audio/vad/include/"
             ],
             "libs": [
                 "log"
             ],
             "sources": [
@@ -1430,31 +1415,30 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM",
                 "WEBRTC_ARCH_ARM_V7",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
                 "WEBRTC_ANDROID_OPENSLES"
             ],
             "deps": [],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-arm-linux-androideabi/gn-output/gen/",
+                "/home/dminor/src/fennec/obj-arm-linux-androideabi/media/webrtc/trunk/gn-output/gen/",
                 "//webrtc/common_audio/resampler/include/",
                 "//webrtc/common_audio/signal_processing/include/",
                 "//webrtc/common_audio/vad/include/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/common_audio/fft4g.c",
                 "//webrtc/common_audio/fft4g.h",
@@ -1570,33 +1554,32 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM",
                 "WEBRTC_ARCH_ARM_V7",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
                 "WEBRTC_ANDROID_OPENSLES"
             ],
             "deps": [
                 "//webrtc/common_audio:common_audio_neon_c"
             ],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-arm-linux-androideabi/gn-output/gen/"
+                "/home/dminor/src/fennec/obj-arm-linux-androideabi/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/common_audio/fir_filter_neon.cc",
                 "//webrtc/common_audio/resampler/sinc_resampler_neon.cc"
             ],
             "type": "static_library"
         },
@@ -1658,31 +1641,30 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM",
                 "WEBRTC_ARCH_ARM_V7",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
                 "WEBRTC_ANDROID_OPENSLES"
             ],
             "deps": [],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-arm-linux-androideabi/gn-output/gen/"
+                "/home/dminor/src/fennec/obj-arm-linux-androideabi/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/common_audio/signal_processing/cross_correlation_neon.c",
                 "//webrtc/common_audio/signal_processing/downsample_fast_neon.c",
                 "//webrtc/common_audio/signal_processing/min_max_operations_neon.c"
             ],
             "type": "source_set"
@@ -1745,17 +1727,16 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM",
                 "WEBRTC_ARCH_ARM_V7",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
@@ -1767,17 +1748,17 @@
                 "//webrtc/api:video_frame_api",
                 "//webrtc/base:rtc_task_queue",
                 "//webrtc/system_wrappers:system_wrappers"
             ],
             "include_dirs": [
                 "//webrtc/modules/interface/",
                 "/media/libyuv/libyuv/include/",
                 "//",
-                "/home/dminor/src/fennec/obj-arm-linux-androideabi/gn-output/gen/",
+                "/home/dminor/src/fennec/obj-arm-linux-androideabi/media/webrtc/trunk/gn-output/gen/",
                 "//webrtc/common_video/include/",
                 "//webrtc/common_video/libyuv/include/"
             ],
             "libs": [
                 "log"
             ],
             "sources": [
                 "//webrtc/common_video/bitrate_adjuster.cc",
@@ -1868,31 +1849,30 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM",
                 "WEBRTC_ARCH_ARM_V7",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
                 "WEBRTC_ANDROID_OPENSLES"
             ],
             "deps": [],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-arm-linux-androideabi/gn-output/gen/"
+                "/home/dminor/src/fennec/obj-arm-linux-androideabi/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/logging/rtc_event_log/rtc_event_log.h"
             ],
             "type": "source_set"
         },
         "//webrtc/logging:rtc_event_log_impl": {
@@ -1953,17 +1933,16 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM",
                 "WEBRTC_ARCH_ARM_V7",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
@@ -1973,17 +1952,17 @@
             "deps": [
                 "//webrtc:webrtc_common",
                 "//webrtc/call:call_interfaces",
                 "//webrtc/logging:rtc_event_log_api",
                 "//webrtc/modules/rtp_rtcp:rtp_rtcp"
             ],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-arm-linux-androideabi/gn-output/gen/"
+                "/home/dminor/src/fennec/obj-arm-linux-androideabi/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [
                 "log"
             ],
             "sources": [
                 "//webrtc/logging/rtc_event_log/ringbuffer.h",
                 "//webrtc/logging/rtc_event_log/rtc_event_log.cc",
                 "//webrtc/logging/rtc_event_log/rtc_event_log_helper_thread.cc",
@@ -2049,31 +2028,30 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM",
                 "WEBRTC_ARCH_ARM_V7",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
                 "WEBRTC_ANDROID_OPENSLES"
             ],
             "deps": [],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-arm-linux-androideabi/gn-output/gen/"
+                "/home/dminor/src/fennec/obj-arm-linux-androideabi/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/media/base/videoadapter.cc",
                 "//webrtc/media/base/videoadapter.h",
                 "//webrtc/media/base/videobroadcaster.cc",
                 "//webrtc/media/base/videobroadcaster.h",
                 "//webrtc/media/base/videosourcebase.cc",
@@ -2141,17 +2119,16 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM",
                 "WEBRTC_ARCH_ARM_V7",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
@@ -2172,17 +2149,17 @@
                 "//webrtc/modules/audio_coding:neteq",
                 "//webrtc/modules/audio_coding:pcm16b",
                 "//webrtc/modules/audio_coding:rent_a_codec",
                 "//webrtc/modules/audio_coding:webrtc_opus",
                 "//webrtc/system_wrappers:system_wrappers"
             ],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-arm-linux-androideabi/gn-output/gen/",
+                "/home/dminor/src/fennec/obj-arm-linux-androideabi/media/webrtc/trunk/gn-output/gen/",
                 "//webrtc/modules/audio_coding/include/",
                 "//webrtc/modules/include/",
                 "//",
                 "//webrtc/modules/audio_coding/codecs/cng/include/",
                 "//",
                 "//webrtc/modules/audio_coding/codecs/g711/include/",
                 "//",
                 "//webrtc/modules/audio_coding/codecs/pcm16b/include/",
@@ -2271,17 +2248,16 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM",
                 "WEBRTC_ARCH_ARM_V7",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
@@ -2290,17 +2266,17 @@
             "deps": [
                 "//webrtc/base:rtc_base_approved",
                 "//webrtc/modules/audio_coding:audio_decoder_interface",
                 "//webrtc/modules/audio_coding:audio_format",
                 "//webrtc/modules/audio_coding:audio_format_conversion"
             ],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-arm-linux-androideabi/gn-output/gen/"
+                "/home/dminor/src/fennec/obj-arm-linux-androideabi/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [
                 "log"
             ],
             "sources": [
                 "//webrtc/modules/audio_coding/codecs/audio_decoder_factory.h"
             ],
             "type": "source_set"
@@ -2363,34 +2339,33 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM",
                 "WEBRTC_ARCH_ARM_V7",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
                 "WEBRTC_ANDROID_OPENSLES"
             ],
             "deps": [
                 "//webrtc:webrtc_common",
                 "//webrtc/base:rtc_base_approved"
             ],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-arm-linux-androideabi/gn-output/gen/"
+                "/home/dminor/src/fennec/obj-arm-linux-androideabi/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [
                 "log"
             ],
             "sources": [
                 "//webrtc/modules/audio_coding/codecs/audio_decoder.cc",
                 "//webrtc/modules/audio_coding/codecs/audio_decoder.h",
                 "//webrtc/modules/audio_coding/codecs/legacy_encoded_audio_frame.cc",
@@ -2456,34 +2431,33 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM",
                 "WEBRTC_ARCH_ARM_V7",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
                 "WEBRTC_ANDROID_OPENSLES"
             ],
             "deps": [
                 "//webrtc:webrtc_common",
                 "//webrtc/base:rtc_base_approved"
             ],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-arm-linux-androideabi/gn-output/gen/"
+                "/home/dminor/src/fennec/obj-arm-linux-androideabi/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [
                 "log"
             ],
             "sources": [
                 "//webrtc/modules/audio_coding/codecs/audio_encoder.cc",
                 "//webrtc/modules/audio_coding/codecs/audio_encoder.h"
             ],
@@ -2547,33 +2521,32 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM",
                 "WEBRTC_ARCH_ARM_V7",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
                 "WEBRTC_ANDROID_OPENSLES"
             ],
             "deps": [
                 "//webrtc:webrtc_common"
             ],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-arm-linux-androideabi/gn-output/gen/"
+                "/home/dminor/src/fennec/obj-arm-linux-androideabi/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/modules/audio_coding/codecs/audio_format.cc",
                 "//webrtc/modules/audio_coding/codecs/audio_format.h"
             ],
             "type": "static_library"
         },
@@ -2635,17 +2608,16 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM",
                 "WEBRTC_ARCH_ARM_V7",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
@@ -2653,17 +2625,17 @@
             ],
             "deps": [
                 "//webrtc:webrtc_common",
                 "//webrtc/base:rtc_base_approved",
                 "//webrtc/modules/audio_coding:audio_format"
             ],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-arm-linux-androideabi/gn-output/gen/"
+                "/home/dminor/src/fennec/obj-arm-linux-androideabi/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [
                 "log"
             ],
             "sources": [
                 "//webrtc/modules/audio_coding/codecs/audio_format_conversion.cc",
                 "//webrtc/modules/audio_coding/codecs/audio_format_conversion.h"
             ],
@@ -2727,17 +2699,16 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM",
                 "WEBRTC_ARCH_ARM_V7",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
@@ -2746,17 +2717,17 @@
             "deps": [
                 "//webrtc:webrtc_common",
                 "//webrtc/base:rtc_base_approved",
                 "//webrtc/common_audio:common_audio",
                 "//webrtc/system_wrappers:system_wrappers"
             ],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-arm-linux-androideabi/gn-output/gen/",
+                "/home/dminor/src/fennec/obj-arm-linux-androideabi/media/webrtc/trunk/gn-output/gen/",
                 "//webrtc/common_audio/resampler/include/",
                 "//webrtc/common_audio/signal_processing/include/",
                 "//webrtc/common_audio/vad/include/"
             ],
             "libs": [
                 "log"
             ],
             "sources": [
@@ -2843,17 +2814,16 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM",
                 "WEBRTC_ARCH_ARM_V7",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
@@ -2867,17 +2837,17 @@
                 "//webrtc/modules/audio_coding:g711",
                 "//webrtc/modules/audio_coding:g722",
                 "//webrtc/modules/audio_coding:isac_fix",
                 "//webrtc/modules/audio_coding:pcm16b",
                 "//webrtc/modules/audio_coding:webrtc_opus"
             ],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-arm-linux-androideabi/gn-output/gen/",
+                "/home/dminor/src/fennec/obj-arm-linux-androideabi/media/webrtc/trunk/gn-output/gen/",
                 "//",
                 "//webrtc/modules/audio_coding/codecs/cng/include/",
                 "//",
                 "//webrtc/modules/audio_coding/codecs/g711/include/",
                 "//",
                 "//webrtc/modules/audio_coding/codecs/pcm16b/include/",
                 "//",
                 "//webrtc/modules/audio_coding/codecs/isac/fix/include/",
@@ -2951,17 +2921,16 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM",
                 "WEBRTC_ARCH_ARM_V7",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
@@ -2970,17 +2939,17 @@
             "deps": [
                 "//webrtc:webrtc_common",
                 "//webrtc/base:rtc_base_approved",
                 "//webrtc/common_audio:common_audio",
                 "//webrtc/modules/audio_coding:audio_encoder_interface"
             ],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-arm-linux-androideabi/gn-output/gen/",
+                "/home/dminor/src/fennec/obj-arm-linux-androideabi/media/webrtc/trunk/gn-output/gen/",
                 "//",
                 "//webrtc/modules/audio_coding/codecs/cng/include/",
                 "//webrtc/common_audio/resampler/include/",
                 "//webrtc/common_audio/signal_processing/include/",
                 "//webrtc/common_audio/vad/include/"
             ],
             "libs": [
                 "log"
@@ -3051,17 +3020,16 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM",
                 "WEBRTC_ARCH_ARM_V7",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
@@ -3071,17 +3039,17 @@
                 "//webrtc:webrtc_common",
                 "//webrtc/base:rtc_base_approved",
                 "//webrtc/modules/audio_coding:audio_decoder_interface",
                 "//webrtc/modules/audio_coding:audio_encoder_interface",
                 "//webrtc/modules/audio_coding:g711_c"
             ],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-arm-linux-androideabi/gn-output/gen/",
+                "/home/dminor/src/fennec/obj-arm-linux-androideabi/media/webrtc/trunk/gn-output/gen/",
                 "//",
                 "//webrtc/modules/audio_coding/codecs/g711/include/"
             ],
             "libs": [
                 "log"
             ],
             "sources": [
                 "//webrtc/modules/audio_coding/codecs/g711/audio_decoder_pcm.cc",
@@ -3149,33 +3117,32 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM",
                 "WEBRTC_ARCH_ARM_V7",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
                 "WEBRTC_ANDROID_OPENSLES"
             ],
             "deps": [
                 "//webrtc:webrtc_common"
             ],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-arm-linux-androideabi/gn-output/gen/"
+                "/home/dminor/src/fennec/obj-arm-linux-androideabi/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/modules/audio_coding/codecs/g711/g711.c",
                 "//webrtc/modules/audio_coding/codecs/g711/g711.h",
                 "//webrtc/modules/audio_coding/codecs/g711/g711_interface.c",
                 "//webrtc/modules/audio_coding/codecs/g711/g711_interface.h"
             ],
@@ -3239,17 +3206,16 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM",
                 "WEBRTC_ARCH_ARM_V7",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
@@ -3259,17 +3225,17 @@
                 "//webrtc:webrtc_common",
                 "//webrtc/base:rtc_base_approved",
                 "//webrtc/modules/audio_coding:audio_decoder_interface",
                 "//webrtc/modules/audio_coding:audio_encoder_interface",
                 "//webrtc/modules/audio_coding:g722_c"
             ],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-arm-linux-androideabi/gn-output/gen/",
+                "/home/dminor/src/fennec/obj-arm-linux-androideabi/media/webrtc/trunk/gn-output/gen/",
                 "//",
                 "//webrtc/modules/audio_coding/codecs/g722/include/"
             ],
             "libs": [
                 "log"
             ],
             "sources": [
                 "//webrtc/modules/audio_coding/codecs/g722/audio_decoder_g722.cc",
@@ -3337,33 +3303,32 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM",
                 "WEBRTC_ARCH_ARM_V7",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
                 "WEBRTC_ANDROID_OPENSLES"
             ],
             "deps": [
                 "//webrtc:webrtc_common"
             ],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-arm-linux-androideabi/gn-output/gen/"
+                "/home/dminor/src/fennec/obj-arm-linux-androideabi/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/modules/audio_coding/codecs/g722/g722_decode.c",
                 "//webrtc/modules/audio_coding/codecs/g722/g722_enc_dec.h",
                 "//webrtc/modules/audio_coding/codecs/g722/g722_encode.c",
                 "//webrtc/modules/audio_coding/codecs/g722/g722_interface.c",
                 "//webrtc/modules/audio_coding/codecs/g722/g722_interface.h"
@@ -3428,17 +3393,16 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM",
                 "WEBRTC_ARCH_ARM_V7",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
@@ -3447,17 +3411,17 @@
             "deps": [
                 "//webrtc/modules/audio_coding:audio_decoder_interface",
                 "//webrtc/modules/audio_coding:audio_encoder_interface",
                 "//webrtc/modules/audio_coding:isac_c",
                 "//webrtc/modules/audio_coding:isac_common"
             ],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-arm-linux-androideabi/gn-output/gen/",
+                "/home/dminor/src/fennec/obj-arm-linux-androideabi/media/webrtc/trunk/gn-output/gen/",
                 "//",
                 "//webrtc/modules/audio_coding/codecs/isac/main/include/"
             ],
             "libs": [
                 "log"
             ],
             "sources": [
                 "//webrtc/modules/audio_coding/codecs/isac/main/source/audio_decoder_isac.cc",
@@ -3523,17 +3487,16 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM",
                 "WEBRTC_ARCH_ARM_V7",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
@@ -3542,17 +3505,17 @@
             "deps": [
                 "//webrtc:webrtc_common",
                 "//webrtc/base:rtc_base_approved",
                 "//webrtc/common_audio:common_audio",
                 "//webrtc/modules/audio_coding:isac_common"
             ],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-arm-linux-androideabi/gn-output/gen/",
+                "/home/dminor/src/fennec/obj-arm-linux-androideabi/media/webrtc/trunk/gn-output/gen/",
                 "//",
                 "//webrtc/modules/audio_coding/codecs/isac/main/include/",
                 "//webrtc/common_audio/resampler/include/",
                 "//webrtc/common_audio/signal_processing/include/",
                 "//webrtc/common_audio/vad/include/"
             ],
             "libs": [
                 "log"
@@ -3671,34 +3634,33 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM",
                 "WEBRTC_ARCH_ARM_V7",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
                 "WEBRTC_ANDROID_OPENSLES"
             ],
             "deps": [
                 "//webrtc/base:rtc_base_approved",
                 "//webrtc/modules/audio_coding:audio_encoder_interface"
             ],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-arm-linux-androideabi/gn-output/gen/"
+                "/home/dminor/src/fennec/obj-arm-linux-androideabi/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [
                 "log"
             ],
             "sources": [
                 "//webrtc/modules/audio_coding/codecs/isac/audio_encoder_isac_t.h",
                 "//webrtc/modules/audio_coding/codecs/isac/audio_encoder_isac_t_impl.h",
                 "//webrtc/modules/audio_coding/codecs/isac/locked_bandwidth_info.cc",
@@ -3764,17 +3726,16 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM",
                 "WEBRTC_ARCH_ARM_V7",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
@@ -3786,17 +3747,17 @@
                 "//webrtc/modules/audio_coding:audio_encoder_interface",
                 "//webrtc/modules/audio_coding:isac_common",
                 "//webrtc/modules/audio_coding:isac_fix_c",
                 "//webrtc/modules/audio_coding:isac_neon",
                 "//webrtc/system_wrappers:system_wrappers"
             ],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-arm-linux-androideabi/gn-output/gen/",
+                "/home/dminor/src/fennec/obj-arm-linux-androideabi/media/webrtc/trunk/gn-output/gen/",
                 "//",
                 "//webrtc/modules/audio_coding/codecs/isac/fix/include/",
                 "//webrtc/common_audio/resampler/include/",
                 "//webrtc/common_audio/signal_processing/include/",
                 "//webrtc/common_audio/vad/include/"
             ],
             "libs": [
                 "log"
@@ -3865,17 +3826,16 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM",
                 "WEBRTC_ARCH_ARM_V7",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
@@ -3887,17 +3847,17 @@
                 "//webrtc/common_audio:common_audio",
                 "//webrtc/modules/audio_coding:audio_decoder_interface",
                 "//webrtc/modules/audio_coding:audio_encoder_interface",
                 "//webrtc/modules/audio_coding:isac_common",
                 "//webrtc/system_wrappers:system_wrappers"
             ],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-arm-linux-androideabi/gn-output/gen/",
+                "/home/dminor/src/fennec/obj-arm-linux-androideabi/media/webrtc/trunk/gn-output/gen/",
                 "//",
                 "//webrtc/modules/audio_coding/codecs/isac/fix/include/",
                 "//webrtc/common_audio/resampler/include/",
                 "//webrtc/common_audio/signal_processing/include/",
                 "//webrtc/common_audio/vad/include/"
             ],
             "libs": [
                 "log"
@@ -4010,17 +3970,16 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM",
                 "WEBRTC_ARCH_ARM_V7",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
@@ -4028,17 +3987,17 @@
             ],
             "deps": [
                 "//webrtc/base:rtc_base_approved",
                 "//webrtc/common_audio:common_audio",
                 "//webrtc/modules/audio_coding:isac_fix_c"
             ],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-arm-linux-androideabi/gn-output/gen/",
+                "/home/dminor/src/fennec/obj-arm-linux-androideabi/media/webrtc/trunk/gn-output/gen/",
                 "//",
                 "//webrtc/modules/audio_coding/codecs/isac/fix/include/",
                 "//webrtc/common_audio/resampler/include/",
                 "//webrtc/common_audio/signal_processing/include/",
                 "//webrtc/common_audio/vad/include/"
             ],
             "libs": [
                 "log"
@@ -4113,17 +4072,16 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM",
                 "WEBRTC_ARCH_ARM_V7",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
@@ -4144,17 +4102,17 @@
                 "//webrtc/modules/audio_coding:isac_fix",
                 "//webrtc/modules/audio_coding:pcm16b",
                 "//webrtc/modules/audio_coding:rent_a_codec",
                 "//webrtc/modules/audio_coding:webrtc_opus",
                 "//webrtc/system_wrappers:system_wrappers"
             ],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-arm-linux-androideabi/gn-output/gen/",
+                "/home/dminor/src/fennec/obj-arm-linux-androideabi/media/webrtc/trunk/gn-output/gen/",
                 "//",
                 "//webrtc/modules/audio_coding/codecs/cng/include/",
                 "//",
                 "//webrtc/modules/audio_coding/codecs/g711/include/",
                 "//",
                 "//webrtc/modules/audio_coding/codecs/isac/fix/include/",
                 "//",
                 "//webrtc/modules/audio_coding/codecs/pcm16b/include/",
@@ -4300,17 +4258,16 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM",
                 "WEBRTC_ARCH_ARM_V7",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
@@ -4321,17 +4278,17 @@
                 "//webrtc/base:rtc_base_approved",
                 "//webrtc/modules/audio_coding:audio_decoder_interface",
                 "//webrtc/modules/audio_coding:audio_encoder_interface",
                 "//webrtc/modules/audio_coding:g711",
                 "//webrtc/modules/audio_coding:pcm16b_c"
             ],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-arm-linux-androideabi/gn-output/gen/",
+                "/home/dminor/src/fennec/obj-arm-linux-androideabi/media/webrtc/trunk/gn-output/gen/",
                 "//",
                 "//webrtc/modules/audio_coding/codecs/pcm16b/include/",
                 "//",
                 "//webrtc/modules/audio_coding/codecs/g711/include/"
             ],
             "libs": [
                 "log"
             ],
@@ -4401,33 +4358,32 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM",
                 "WEBRTC_ARCH_ARM_V7",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
                 "WEBRTC_ANDROID_OPENSLES"
             ],
             "deps": [
                 "//webrtc:webrtc_common"
             ],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-arm-linux-androideabi/gn-output/gen/",
+                "/home/dminor/src/fennec/obj-arm-linux-androideabi/media/webrtc/trunk/gn-output/gen/",
                 "//",
                 "//webrtc/modules/audio_coding/codecs/pcm16b/include/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/modules/audio_coding/codecs/pcm16b/pcm16b.c",
                 "//webrtc/modules/audio_coding/codecs/pcm16b/pcm16b.h"
             ],
@@ -4493,17 +4449,16 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM",
                 "WEBRTC_ARCH_ARM_V7",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
@@ -4517,17 +4472,17 @@
                 "//webrtc/modules/audio_coding:g711",
                 "//webrtc/modules/audio_coding:g722",
                 "//webrtc/modules/audio_coding:isac_fix",
                 "//webrtc/modules/audio_coding:pcm16b",
                 "//webrtc/modules/audio_coding:webrtc_opus"
             ],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-arm-linux-androideabi/gn-output/gen/",
+                "/home/dminor/src/fennec/obj-arm-linux-androideabi/media/webrtc/trunk/gn-output/gen/",
                 "//",
                 "//webrtc/modules/audio_coding/codecs/cng/include/",
                 "//",
                 "//webrtc/modules/audio_coding/codecs/g711/include/",
                 "//",
                 "//webrtc/modules/audio_coding/codecs/pcm16b/include/",
                 "//",
                 "//webrtc/modules/audio_coding/codecs/isac/fix/include/",
@@ -4604,17 +4559,16 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM",
                 "WEBRTC_ARCH_ARM_V7",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
@@ -4629,17 +4583,17 @@
                 "//webrtc/modules/audio_coding:audio_encoder_interface",
                 "//webrtc/modules/audio_coding:audio_network_adaptor",
                 "//webrtc/modules/audio_coding:webrtc_opus_c",
                 "//webrtc/system_wrappers:system_wrappers"
             ],
             "include_dirs": [
                 "/include/opus/",
                 "//",
-                "/home/dminor/src/fennec/obj-arm-linux-androideabi/gn-output/gen/",
+                "/home/dminor/src/fennec/obj-arm-linux-androideabi/media/webrtc/trunk/gn-output/gen/",
                 "//webrtc/common_audio/resampler/include/",
                 "//webrtc/common_audio/signal_processing/include/",
                 "//webrtc/common_audio/vad/include/"
             ],
             "libs": [
                 "log"
             ],
             "sources": [
@@ -4708,17 +4662,16 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM",
                 "WEBRTC_ARCH_ARM_V7",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
@@ -4726,17 +4679,17 @@
             ],
             "deps": [
                 "//webrtc:webrtc_common",
                 "//webrtc/base:rtc_base_approved"
             ],
             "include_dirs": [
                 "/media/libopus/include/",
                 "//",
-                "/home/dminor/src/fennec/obj-arm-linux-androideabi/gn-output/gen/"
+                "/home/dminor/src/fennec/obj-arm-linux-androideabi/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [
                 "log"
             ],
             "sources": [
                 "//webrtc/modules/audio_coding/codecs/opus/opus_inst.h",
                 "//webrtc/modules/audio_coding/codecs/opus/opus_interface.c",
                 "//webrtc/modules/audio_coding/codecs/opus/opus_interface.h"
@@ -4801,17 +4754,16 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM",
                 "WEBRTC_ARCH_ARM_V7",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
@@ -4821,17 +4773,17 @@
                 "//webrtc:webrtc_common",
                 "//webrtc/audio/utility:audio_frame_operations",
                 "//webrtc/base:rtc_base_approved",
                 "//webrtc/modules/audio_processing:audio_processing",
                 "//webrtc/system_wrappers:system_wrappers"
             ],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-arm-linux-androideabi/gn-output/gen/",
+                "/home/dminor/src/fennec/obj-arm-linux-androideabi/media/webrtc/trunk/gn-output/gen/",
                 "//webrtc/modules/audio_conference_mixer/include/",
                 "//webrtc/modules/include/"
             ],
             "libs": [
                 "log"
             ],
             "sources": [
                 "//webrtc/modules/audio_conference_mixer/include/audio_conference_mixer.h",
@@ -4890,32 +4842,32 @@
                 "-Wno-missing-field-initializers",
                 "-Wno-strict-overflow",
                 "-fno-builtin-cos",
                 "-fno-builtin-sin",
                 "-fno-builtin-cosf",
                 "-fno-builtin-sinf"
             ],
             "defines": [
+                "WEBRTC_DUMMY_AUDIO_BUILD",
                 "V8_DEPRECATION_WARNINGS",
                 "USE_OPENSSL_CERTS=1",
                 "NO_TCMALLOC",
                 "DISABLE_NACL",
                 "CHROMIUM_BUILD",
                 "_FILE_OFFSET_BITS=64",
                 "ANDROID",
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM",
                 "WEBRTC_ARCH_ARM_V7",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
@@ -4927,31 +4879,27 @@
                 "//webrtc/base:rtc_base_approved",
                 "//webrtc/base:rtc_task_queue",
                 "//webrtc/common_audio:common_audio",
                 "//webrtc/modules/utility:utility",
                 "//webrtc/system_wrappers:system_wrappers"
             ],
             "include_dirs": [
                 "//webrtc/modules/audio_device/android/",
-                "/config/external/nspr/",
-                "/nsprpub/lib/ds/",
-                "/nsprpub/pr/include/",
                 "//",
-                "/home/dminor/src/fennec/obj-arm-linux-androideabi/gn-output/gen/",
+                "/home/dminor/src/fennec/obj-arm-linux-androideabi/media/webrtc/trunk/gn-output/gen/",
                 "//webrtc/modules/include/",
                 "//webrtc/modules/audio_device/include/",
                 "//webrtc/modules/audio_device/dummy/",
                 "//webrtc/common_audio/resampler/include/",
                 "//webrtc/common_audio/signal_processing/include/",
                 "//webrtc/common_audio/vad/include/"
             ],
             "libs": [
-                "log",
-                "OpenSLES"
+                "log"
             ],
             "sources": [
                 "//webrtc/modules/audio_device/audio_device_buffer.cc",
                 "//webrtc/modules/audio_device/audio_device_buffer.h",
                 "//webrtc/modules/audio_device/audio_device_config.h",
                 "//webrtc/modules/audio_device/audio_device_generic.cc",
                 "//webrtc/modules/audio_device/audio_device_generic.h",
                 "//webrtc/modules/audio_device/dummy/audio_device_dummy.cc",
@@ -4959,33 +4907,16 @@
                 "//webrtc/modules/audio_device/dummy/file_audio_device.cc",
                 "//webrtc/modules/audio_device/dummy/file_audio_device.h",
                 "//webrtc/modules/audio_device/fine_audio_buffer.cc",
                 "//webrtc/modules/audio_device/fine_audio_buffer.h",
                 "//webrtc/modules/audio_device/include/audio_device.h",
                 "//webrtc/modules/audio_device/include/audio_device_defines.h",
                 "//webrtc/modules/audio_device/opensl/single_rw_fifo.cc",
                 "//webrtc/modules/audio_device/opensl/single_rw_fifo.h",
-                "//webrtc/modules/audio_device/audio_device_impl.cc",
-                "//webrtc/modules/audio_device/audio_device_impl.h",
-                "//webrtc/modules/audio_device/android/audio_device_template.h",
-                "//webrtc/modules/audio_device/android/audio_manager.cc",
-                "//webrtc/modules/audio_device/android/audio_manager.h",
-                "//webrtc/modules/audio_device/android/audio_record_jni.cc",
-                "//webrtc/modules/audio_device/android/audio_record_jni.h",
-                "//webrtc/modules/audio_device/android/audio_track_jni.cc",
-                "//webrtc/modules/audio_device/android/audio_track_jni.h",
-                "//webrtc/modules/audio_device/android/build_info.cc",
-                "//webrtc/modules/audio_device/android/build_info.h",
-                "//webrtc/modules/audio_device/android/opensles_common.cc",
-                "//webrtc/modules/audio_device/android/opensles_common.h",
-                "//webrtc/modules/audio_device/android/opensles_player.cc",
-                "//webrtc/modules/audio_device/android/opensles_player.h",
-                "//webrtc/modules/audio_device/android/opensles_recorder.cc",
-                "//webrtc/modules/audio_device/android/opensles_recorder.h",
                 "//webrtc/modules/audio_device/dummy/file_audio_device_factory.cc",
                 "//webrtc/modules/audio_device/dummy/file_audio_device_factory.h"
             ],
             "type": "static_library"
         },
         "//webrtc/modules/audio_mixer:audio_frame_manipulator": {
             "cflags": [
                 "-fno-strict-aliasing",
@@ -5044,34 +4975,33 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM",
                 "WEBRTC_ARCH_ARM_V7",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
                 "WEBRTC_ANDROID_OPENSLES"
             ],
             "deps": [
                 "//webrtc/audio/utility:utility",
                 "//webrtc/base:rtc_base_approved"
             ],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-arm-linux-androideabi/gn-output/gen/"
+                "/home/dminor/src/fennec/obj-arm-linux-androideabi/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [
                 "log"
             ],
             "sources": [
                 "//webrtc/modules/audio_mixer/audio_frame_manipulator.cc",
                 "//webrtc/modules/audio_mixer/audio_frame_manipulator.h"
             ],
@@ -5135,17 +5065,16 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM",
                 "WEBRTC_ARCH_ARM_V7",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
@@ -5157,17 +5086,17 @@
                 "//webrtc/audio/utility:audio_frame_operations",
                 "//webrtc/base:rtc_base_approved",
                 "//webrtc/modules/audio_mixer:audio_frame_manipulator",
                 "//webrtc/modules/audio_processing:audio_processing",
                 "//webrtc/system_wrappers:system_wrappers"
             ],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-arm-linux-androideabi/gn-output/gen/"
+                "/home/dminor/src/fennec/obj-arm-linux-androideabi/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [
                 "log"
             ],
             "sources": [
                 "//webrtc/modules/audio_mixer/audio_mixer_impl.cc",
                 "//webrtc/modules/audio_mixer/audio_mixer_impl.h",
                 "//webrtc/modules/audio_mixer/default_output_rate_calculator.cc",
@@ -5237,17 +5166,16 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM",
                 "WEBRTC_ARCH_ARM_V7",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
@@ -5261,17 +5189,17 @@
                 "//webrtc/common_audio:common_audio",
                 "//webrtc/modules/audio_coding:isac",
                 "//webrtc/modules/audio_processing:audio_processing_c",
                 "//webrtc/modules/audio_processing:audio_processing_neon",
                 "//webrtc/system_wrappers:system_wrappers"
             ],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-arm-linux-androideabi/gn-output/gen/",
+                "/home/dminor/src/fennec/obj-arm-linux-androideabi/media/webrtc/trunk/gn-output/gen/",
                 "//",
                 "//webrtc/modules/audio_coding/codecs/isac/main/include/",
                 "//webrtc/common_audio/resampler/include/",
                 "//webrtc/common_audio/signal_processing/include/",
                 "//webrtc/common_audio/vad/include/"
             ],
             "libs": [
                 "log"
@@ -5488,17 +5416,16 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM",
                 "WEBRTC_ARCH_ARM_V7",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
@@ -5507,17 +5434,17 @@
             "deps": [
                 "//webrtc:webrtc_common",
                 "//webrtc/base:rtc_base_approved",
                 "//webrtc/common_audio:common_audio",
                 "//webrtc/system_wrappers:system_wrappers"
             ],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-arm-linux-androideabi/gn-output/gen/",
+                "/home/dminor/src/fennec/obj-arm-linux-androideabi/media/webrtc/trunk/gn-output/gen/",
                 "//webrtc/common_audio/resampler/include/",
                 "//webrtc/common_audio/signal_processing/include/",
                 "//webrtc/common_audio/vad/include/"
             ],
             "libs": [
                 "log"
             ],
             "sources": [
@@ -5594,34 +5521,33 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM",
                 "WEBRTC_ARCH_ARM_V7",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
                 "WEBRTC_ANDROID_OPENSLES"
             ],
             "deps": [
                 "//webrtc/common_audio:common_audio",
                 "//webrtc/modules/audio_processing:audio_processing_neon_c"
             ],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-arm-linux-androideabi/gn-output/gen/",
+                "/home/dminor/src/fennec/obj-arm-linux-androideabi/media/webrtc/trunk/gn-output/gen/",
                 "//webrtc/common_audio/resampler/include/",
                 "//webrtc/common_audio/signal_processing/include/",
                 "//webrtc/common_audio/vad/include/"
             ],
             "libs": [
                 "log"
             ],
             "sources": [
@@ -5690,34 +5616,33 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM",
                 "WEBRTC_ARCH_ARM_V7",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
                 "WEBRTC_ANDROID_OPENSLES"
             ],
             "deps": [
                 "//webrtc/base:rtc_base_approved",
                 "//webrtc/modules/audio_processing:audio_processing_c"
             ],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-arm-linux-androideabi/gn-output/gen/"
+                "/home/dminor/src/fennec/obj-arm-linux-androideabi/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [
                 "log"
             ],
             "sources": [
                 "//webrtc/modules/audio_processing/ns/nsx_core_neon.c"
             ],
             "type": "static_library"
@@ -5781,17 +5706,16 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM",
                 "WEBRTC_ARCH_ARM_V7",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
@@ -5800,17 +5724,17 @@
             ],
             "deps": [
                 "//webrtc/base:rtc_base_approved",
                 "//webrtc/modules/rtp_rtcp:rtp_rtcp",
                 "//webrtc/system_wrappers:system_wrappers"
             ],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-arm-linux-androideabi/gn-output/gen/"
+                "/home/dminor/src/fennec/obj-arm-linux-androideabi/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [
                 "log"
             ],
             "sources": [
                 "//webrtc/modules/bitrate_controller/bitrate_controller_impl.cc",
                 "//webrtc/modules/bitrate_controller/bitrate_controller_impl.h",
                 "//webrtc/modules/bitrate_controller/include/bitrate_controller.h",
@@ -5878,17 +5802,16 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM",
                 "WEBRTC_ARCH_ARM_V7",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
@@ -5903,17 +5826,17 @@
                 "//webrtc/modules/pacing:pacing",
                 "//webrtc/modules/remote_bitrate_estimator:remote_bitrate_estimator",
                 "//webrtc/modules/rtp_rtcp:rtp_rtcp",
                 "//webrtc/modules/utility:utility",
                 "//webrtc/system_wrappers:system_wrappers"
             ],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-arm-linux-androideabi/gn-output/gen/"
+                "/home/dminor/src/fennec/obj-arm-linux-androideabi/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [
                 "log"
             ],
             "sources": [
                 "//webrtc/modules/congestion_controller/congestion_controller.cc",
                 "//webrtc/modules/congestion_controller/delay_based_bwe.cc",
                 "//webrtc/modules/congestion_controller/delay_based_bwe.h",
@@ -5991,17 +5914,16 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM",
                 "WEBRTC_ARCH_ARM_V7",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
@@ -6010,17 +5932,17 @@
             "deps": [
                 "//webrtc:webrtc_common",
                 "//webrtc/base:rtc_base_approved",
                 "//webrtc/common_audio:common_audio",
                 "//webrtc/system_wrappers:system_wrappers"
             ],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-arm-linux-androideabi/gn-output/gen/",
+                "/home/dminor/src/fennec/obj-arm-linux-androideabi/media/webrtc/trunk/gn-output/gen/",
                 "//webrtc/common_audio/resampler/include/",
                 "//webrtc/common_audio/signal_processing/include/",
                 "//webrtc/common_audio/vad/include/"
             ],
             "libs": [
                 "log"
             ],
             "sources": [
@@ -6091,17 +6013,16 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM",
                 "WEBRTC_ARCH_ARM_V7",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
@@ -6111,17 +6032,17 @@
             "deps": [
                 "//webrtc:webrtc_common",
                 "//webrtc/base:rtc_base_approved",
                 "//webrtc/modules/rtp_rtcp:rtp_rtcp",
                 "//webrtc/system_wrappers:system_wrappers"
             ],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-arm-linux-androideabi/gn-output/gen/"
+                "/home/dminor/src/fennec/obj-arm-linux-androideabi/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [
                 "log"
             ],
             "sources": [
                 "//webrtc/modules/pacing/alr_detector.cc",
                 "//webrtc/modules/pacing/alr_detector.h",
                 "//webrtc/modules/pacing/bitrate_prober.cc",
@@ -6192,17 +6113,16 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM",
                 "WEBRTC_ARCH_ARM_V7",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
@@ -6210,17 +6130,17 @@
             ],
             "deps": [
                 "//webrtc:webrtc_common",
                 "//webrtc/base:rtc_base_approved",
                 "//webrtc/system_wrappers:system_wrappers"
             ],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-arm-linux-androideabi/gn-output/gen/"
+                "/home/dminor/src/fennec/obj-arm-linux-androideabi/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [
                 "log"
             ],
             "sources": [
                 "//webrtc/modules/remote_bitrate_estimator/aimd_rate_control.cc",
                 "//webrtc/modules/remote_bitrate_estimator/aimd_rate_control.h",
                 "//webrtc/modules/remote_bitrate_estimator/bwe_defines.cc",
@@ -6303,17 +6223,16 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM",
                 "WEBRTC_ARCH_ARM_V7",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
@@ -6329,17 +6248,17 @@
                 "//webrtc/call:call_interfaces",
                 "//webrtc/common_video:common_video",
                 "//webrtc/logging:rtc_event_log_api",
                 "//webrtc/modules/remote_bitrate_estimator:remote_bitrate_estimator",
                 "//webrtc/system_wrappers:system_wrappers"
             ],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-arm-linux-androideabi/gn-output/gen/",
+                "/home/dminor/src/fennec/obj-arm-linux-androideabi/media/webrtc/trunk/gn-output/gen/",
                 "//webrtc/common_video/include/",
                 "//webrtc/common_video/libyuv/include/"
             ],
             "libs": [
                 "log"
             ],
             "sources": [
                 "//webrtc/modules/rtp_rtcp/include/flexfec_receiver.h",
@@ -6552,17 +6471,16 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM",
                 "WEBRTC_ARCH_ARM_V7",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
@@ -6578,17 +6496,17 @@
                 "//webrtc/modules/audio_coding:audio_format_conversion",
                 "//webrtc/modules/audio_coding:builtin_audio_decoder_factory",
                 "//webrtc/modules/audio_coding:rent_a_codec",
                 "//webrtc/modules/media_file:media_file",
                 "//webrtc/system_wrappers:system_wrappers"
             ],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-arm-linux-androideabi/gn-output/gen/",
+                "/home/dminor/src/fennec/obj-arm-linux-androideabi/media/webrtc/trunk/gn-output/gen/",
                 "//webrtc/common_audio/resampler/include/",
                 "//webrtc/common_audio/signal_processing/include/",
                 "//webrtc/common_audio/vad/include/",
                 "//webrtc/modules/audio_coding/include/",
                 "//webrtc/modules/include/"
             ],
             "libs": [
                 "log"
@@ -6663,17 +6581,16 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM",
                 "WEBRTC_ARCH_ARM_V7",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
@@ -6685,17 +6602,17 @@
                 "//webrtc/modules/video_capture:video_capture_module",
                 "//webrtc/system_wrappers:system_wrappers"
             ],
             "include_dirs": [
                 "/config/external/nspr/",
                 "/nsprpub/lib/ds/",
                 "/nsprpub/pr/include/",
                 "//",
-                "/home/dminor/src/fennec/obj-arm-linux-androideabi/gn-output/gen/"
+                "/home/dminor/src/fennec/obj-arm-linux-androideabi/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [
                 "log"
             ],
             "sources": [
                 "//webrtc/modules/video_capture/android/device_info_android.cc",
                 "//webrtc/modules/video_capture/android/video_capture_android.cc"
             ],
@@ -6759,17 +6676,16 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM",
                 "WEBRTC_ARCH_ARM_V7",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
@@ -6780,17 +6696,17 @@
                 "//webrtc:webrtc_common",
                 "//webrtc/base:rtc_base_approved",
                 "//webrtc/common_video:common_video",
                 "//webrtc/modules/utility:utility",
                 "//webrtc/system_wrappers:system_wrappers"
             ],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-arm-linux-androideabi/gn-output/gen/",
+                "/home/dminor/src/fennec/obj-arm-linux-androideabi/media/webrtc/trunk/gn-output/gen/",
                 "//webrtc/common_video/include/",
                 "//webrtc/common_video/libyuv/include/"
             ],
             "libs": [
                 "log"
             ],
             "sources": [
                 "//webrtc/modules/video_capture/device_info_impl.cc",
@@ -6864,17 +6780,16 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM",
                 "WEBRTC_ARCH_ARM_V7",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
@@ -6893,17 +6808,17 @@
                 "//webrtc/modules/video_coding:webrtc_h264",
                 "//webrtc/modules/video_coding:webrtc_i420",
                 "//webrtc/modules/video_coding:webrtc_vp8",
                 "//webrtc/modules/video_coding:webrtc_vp9",
                 "//webrtc/system_wrappers:system_wrappers"
             ],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-arm-linux-androideabi/gn-output/gen/",
+                "/home/dminor/src/fennec/obj-arm-linux-androideabi/media/webrtc/trunk/gn-output/gen/",
                 "//webrtc/common_video/include/",
                 "//webrtc/common_video/libyuv/include/"
             ],
             "libs": [
                 "log"
             ],
             "sources": [
                 "//webrtc/modules/video_coding/codec_database.cc",
@@ -7033,17 +6948,16 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM",
                 "WEBRTC_ARCH_ARM_V7",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
@@ -7054,17 +6968,17 @@
                 "//webrtc:webrtc_common",
                 "//webrtc/base:rtc_base_approved",
                 "//webrtc/base:rtc_numerics",
                 "//webrtc/common_video:common_video",
                 "//webrtc/system_wrappers:system_wrappers"
             ],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-arm-linux-androideabi/gn-output/gen/",
+                "/home/dminor/src/fennec/obj-arm-linux-androideabi/media/webrtc/trunk/gn-output/gen/",
                 "//webrtc/common_video/include/",
                 "//webrtc/common_video/libyuv/include/"
             ],
             "libs": [
                 "log"
             ],
             "sources": [
                 "//webrtc/modules/video_coding/utility/default_video_bitrate_allocator.cc",
@@ -7144,17 +7058,16 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM",
                 "WEBRTC_ARCH_ARM_V7",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
@@ -7163,17 +7076,17 @@
             ],
             "deps": [
                 "//webrtc/base:rtc_base_approved",
                 "//webrtc/modules/video_coding:video_coding_utility",
                 "//webrtc/system_wrappers:system_wrappers"
             ],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-arm-linux-androideabi/gn-output/gen/"
+                "/home/dminor/src/fennec/obj-arm-linux-androideabi/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [
                 "log"
             ],
             "sources": [
                 "//webrtc/modules/video_coding/codecs/h264/h264.cc",
                 "//webrtc/modules/video_coding/codecs/h264/include/h264.h"
             ],
@@ -7237,17 +7150,16 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM",
                 "WEBRTC_ARCH_ARM_V7",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
@@ -7257,17 +7169,17 @@
             "deps": [
                 "//webrtc:webrtc_common",
                 "//webrtc/base:rtc_base_approved",
                 "//webrtc/common_video:common_video",
                 "//webrtc/system_wrappers:system_wrappers"
             ],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-arm-linux-androideabi/gn-output/gen/",
+                "/home/dminor/src/fennec/obj-arm-linux-androideabi/media/webrtc/trunk/gn-output/gen/",
                 "//webrtc/common_video/include/",
                 "//webrtc/common_video/libyuv/include/"
             ],
             "libs": [
                 "log"
             ],
             "sources": [
                 "//webrtc/modules/video_coding/codecs/i420/i420.cc",
@@ -7333,17 +7245,16 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM",
                 "WEBRTC_ARCH_ARM_V7",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
@@ -7355,17 +7266,17 @@
                 "//webrtc/base:rtc_base_approved",
                 "//webrtc/common_video:common_video",
                 "//webrtc/modules/video_coding:video_coding_utility",
                 "//webrtc/system_wrappers:system_wrappers"
             ],
             "include_dirs": [
                 "/media/libyuv/libyuv/include/",
                 "//",
-                "/home/dminor/src/fennec/obj-arm-linux-androideabi/gn-output/gen/",
+                "/home/dminor/src/fennec/obj-arm-linux-androideabi/media/webrtc/trunk/gn-output/gen/",
                 "//webrtc/common_video/include/",
                 "//webrtc/common_video/libyuv/include/"
             ],
             "libs": [
                 "log"
             ],
             "sources": [
                 "//webrtc/modules/video_coding/codecs/vp8/default_temporal_layers.cc",
@@ -7443,17 +7354,16 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM",
                 "WEBRTC_ARCH_ARM_V7",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
@@ -7463,17 +7373,17 @@
             "deps": [
                 "//webrtc/base:rtc_base_approved",
                 "//webrtc/common_video:common_video",
                 "//webrtc/modules/video_coding:video_coding_utility",
                 "//webrtc/system_wrappers:system_wrappers"
             ],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-arm-linux-androideabi/gn-output/gen/",
+                "/home/dminor/src/fennec/obj-arm-linux-androideabi/media/webrtc/trunk/gn-output/gen/",
                 "//webrtc/common_video/include/",
                 "//webrtc/common_video/libyuv/include/"
             ],
             "libs": [
                 "log"
             ],
             "sources": [
                 "//webrtc/modules/video_coding/codecs/vp9/include/vp9.h",
@@ -7544,17 +7454,16 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM",
                 "WEBRTC_ARCH_ARM_V7",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
@@ -7567,17 +7476,17 @@
                 "//webrtc/common_video:common_video",
                 "//webrtc/modules/utility:utility",
                 "//webrtc/modules/video_processing:video_processing_neon",
                 "//webrtc/system_wrappers:system_wrappers"
             ],
             "include_dirs": [
                 "/media/libyuv/libyuv/include/",
                 "//",
-                "/home/dminor/src/fennec/obj-arm-linux-androideabi/gn-output/gen/",
+                "/home/dminor/src/fennec/obj-arm-linux-androideabi/media/webrtc/trunk/gn-output/gen/",
                 "//webrtc/common_audio/resampler/include/",
                 "//webrtc/common_audio/signal_processing/include/",
                 "//webrtc/common_audio/vad/include/",
                 "//webrtc/common_video/include/",
                 "//webrtc/common_video/libyuv/include/"
             ],
             "libs": [
                 "log"
@@ -7654,31 +7563,30 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM",
                 "WEBRTC_ARCH_ARM_V7",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
                 "WEBRTC_ANDROID_OPENSLES"
             ],
             "deps": [],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-arm-linux-androideabi/gn-output/gen/"
+                "/home/dminor/src/fennec/obj-arm-linux-androideabi/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/modules/video_processing/util/denoiser_filter_neon.cc",
                 "//webrtc/modules/video_processing/util/denoiser_filter_neon.h"
             ],
             "type": "static_library"
         },
@@ -7740,31 +7648,30 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM",
                 "WEBRTC_ARCH_ARM_V7",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
                 "WEBRTC_ANDROID_OPENSLES"
             ],
             "deps": [],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-arm-linux-androideabi/gn-output/gen/"
+                "/home/dminor/src/fennec/obj-arm-linux-androideabi/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/system_wrappers/include/field_trial_default.h",
                 "//webrtc/system_wrappers/source/field_trial_default.cc"
             ],
             "type": "static_library"
         },
@@ -7826,31 +7733,30 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM",
                 "WEBRTC_ARCH_ARM_V7",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
                 "WEBRTC_ANDROID_OPENSLES"
             ],
             "deps": [],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-arm-linux-androideabi/gn-output/gen/"
+                "/home/dminor/src/fennec/obj-arm-linux-androideabi/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/system_wrappers/include/metrics_default.h",
                 "//webrtc/system_wrappers/source/metrics_default.cc"
             ],
             "type": "static_library"
         },
@@ -7913,17 +7819,16 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM",
                 "WEBRTC_ARCH_ARM_V7",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
@@ -7933,17 +7838,17 @@
                 "//webrtc:webrtc_common",
                 "//webrtc/base:rtc_base_approved"
             ],
             "include_dirs": [
                 "/config/external/nspr/",
                 "/nsprpub/lib/ds/",
                 "/nsprpub/pr/include/",
                 "//",
-                "/home/dminor/src/fennec/obj-arm-linux-androideabi/gn-output/gen/"
+                "/home/dminor/src/fennec/obj-arm-linux-androideabi/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [
                 "log"
             ],
             "sources": [
                 "//webrtc/system_wrappers/include/aligned_array.h",
                 "//webrtc/system_wrappers/include/aligned_malloc.h",
                 "//webrtc/system_wrappers/include/atomic32.h",
@@ -8047,17 +7952,16 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM",
                 "WEBRTC_ARCH_ARM_V7",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
@@ -8080,25 +7984,24 @@
                 "//webrtc/modules/utility:utility",
                 "//webrtc/modules/video_coding:video_coding",
                 "//webrtc/modules/video_processing:video_processing",
                 "//webrtc/system_wrappers:system_wrappers",
                 "//webrtc/voice_engine:voice_engine"
             ],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-arm-linux-androideabi/gn-output/gen/",
+                "/home/dminor/src/fennec/obj-arm-linux-androideabi/media/webrtc/trunk/gn-output/gen/",
                 "//webrtc/common_video/include/",
                 "//webrtc/common_video/libyuv/include/",
                 "//webrtc/modules/audio_coding/include/",
                 "//webrtc/modules/include/"
             ],
             "libs": [
-                "log",
-                "OpenSLES"
+                "log"
             ],
             "sources": [
                 "//webrtc/video/call_stats.cc",
                 "//webrtc/video/call_stats.h",
                 "//webrtc/video/encoder_rtcp_feedback.cc",
                 "//webrtc/video/encoder_rtcp_feedback.h",
                 "//webrtc/video/overuse_frame_detector.cc",
                 "//webrtc/video/overuse_frame_detector.h",
@@ -8195,17 +8098,16 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM",
                 "WEBRTC_ARCH_ARM_V7",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
@@ -8215,17 +8117,17 @@
                 "//webrtc:webrtc_common",
                 "//webrtc/modules/audio_coding:audio_coding",
                 "//webrtc/modules/audio_coding:audio_format_conversion",
                 "//webrtc/modules/audio_coding:builtin_audio_decoder_factory",
                 "//webrtc/modules/audio_coding:rent_a_codec"
             ],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-arm-linux-androideabi/gn-output/gen/",
+                "/home/dminor/src/fennec/obj-arm-linux-androideabi/media/webrtc/trunk/gn-output/gen/",
                 "//webrtc/modules/audio_coding/include/",
                 "//webrtc/modules/include/"
             ],
             "libs": [
                 "log"
             ],
             "sources": [
                 "//webrtc/voice_engine/coder.cc",
@@ -8291,17 +8193,16 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM",
                 "WEBRTC_ARCH_ARM_V7",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
@@ -8311,17 +8212,17 @@
                 "//webrtc:webrtc_common",
                 "//webrtc/common_audio:common_audio",
                 "//webrtc/modules/media_file:media_file",
                 "//webrtc/system_wrappers:system_wrappers",
                 "//webrtc/voice_engine:audio_coder"
             ],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-arm-linux-androideabi/gn-output/gen/",
+                "/home/dminor/src/fennec/obj-arm-linux-androideabi/media/webrtc/trunk/gn-output/gen/",
                 "//webrtc/common_audio/resampler/include/",
                 "//webrtc/common_audio/signal_processing/include/",
                 "//webrtc/common_audio/vad/include/"
             ],
             "libs": [
                 "log"
             ],
             "sources": [
@@ -8388,17 +8289,16 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM",
                 "WEBRTC_ARCH_ARM_V7",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
@@ -8409,17 +8309,17 @@
                 "//webrtc/base:rtc_base_approved",
                 "//webrtc/common_audio:common_audio",
                 "//webrtc/modules/media_file:media_file",
                 "//webrtc/system_wrappers:system_wrappers",
                 "//webrtc/voice_engine:audio_coder"
             ],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-arm-linux-androideabi/gn-output/gen/",
+                "/home/dminor/src/fennec/obj-arm-linux-androideabi/media/webrtc/trunk/gn-output/gen/",
                 "//webrtc/common_audio/resampler/include/",
                 "//webrtc/common_audio/signal_processing/include/",
                 "//webrtc/common_audio/vad/include/"
             ],
             "libs": [
                 "log"
             ],
             "sources": [
@@ -8486,17 +8386,16 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM",
                 "WEBRTC_ARCH_ARM_V7",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
@@ -8504,17 +8403,17 @@
             ],
             "deps": [
                 "//webrtc:webrtc_common",
                 "//webrtc/base:rtc_base_approved",
                 "//webrtc/common_audio:common_audio"
             ],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-arm-linux-androideabi/gn-output/gen/",
+                "/home/dminor/src/fennec/obj-arm-linux-androideabi/media/webrtc/trunk/gn-output/gen/",
                 "//webrtc/common_audio/resampler/include/",
                 "//webrtc/common_audio/signal_processing/include/",
                 "//webrtc/common_audio/vad/include/"
             ],
             "libs": [
                 "log"
             ],
             "sources": [
@@ -8581,17 +8480,16 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM",
                 "WEBRTC_ARCH_ARM_V7",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
@@ -8622,31 +8520,30 @@
                 "//webrtc/modules/utility:utility",
                 "//webrtc/system_wrappers:system_wrappers",
                 "//webrtc/voice_engine:file_player",
                 "//webrtc/voice_engine:file_recorder",
                 "//webrtc/voice_engine:level_indicator"
             ],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-arm-linux-androideabi/gn-output/gen/",
+                "/home/dminor/src/fennec/obj-arm-linux-androideabi/media/webrtc/trunk/gn-output/gen/",
                 "//webrtc/modules/audio_coding/include/",
                 "//webrtc/modules/include/",
                 "//webrtc/common_audio/resampler/include/",
                 "//webrtc/common_audio/signal_processing/include/",
                 "//webrtc/common_audio/vad/include/",
                 "//webrtc/modules/audio_conference_mixer/include/",
                 "//webrtc/modules/include/",
                 "//webrtc/modules/include/",
                 "//webrtc/modules/audio_device/include/",
                 "//webrtc/modules/audio_device/dummy/"
             ],
             "libs": [
-                "log",
-                "OpenSLES"
+                "log"
             ],
             "sources": [
                 "//webrtc/voice_engine/channel.cc",
                 "//webrtc/voice_engine/channel.h",
                 "//webrtc/voice_engine/channel_manager.cc",
                 "//webrtc/voice_engine/channel_manager.h",
                 "//webrtc/voice_engine/channel_proxy.cc",
                 "//webrtc/voice_engine/channel_proxy.h",
@@ -8760,17 +8657,16 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",
                 "NVALGRIND",
                 "DYNAMIC_ANNOTATIONS_ENABLED=0",
                 "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_ARCH_ARM",
                 "WEBRTC_ARCH_ARM_V7",
                 "WEBRTC_HAS_NEON",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_LINUX",
                 "WEBRTC_ANDROID",
@@ -8793,33 +8689,32 @@
                 "//webrtc/system_wrappers:field_trial_default",
                 "//webrtc/system_wrappers:metrics_default",
                 "//webrtc/system_wrappers:system_wrappers",
                 "//webrtc/video:video",
                 "//webrtc/voice_engine:voice_engine"
             ],
             "include_dirs": [
                 "//",
-                "/home/dminor/src/fennec/obj-arm-linux-androideabi/gn-output/gen/",
+                "/home/dminor/src/fennec/obj-arm-linux-androideabi/media/webrtc/trunk/gn-output/gen/",
                 "//webrtc/common_audio/resampler/include/",
                 "//webrtc/common_audio/signal_processing/include/",
                 "//webrtc/common_audio/vad/include/",
                 "//webrtc/common_video/include/",
                 "//webrtc/common_video/libyuv/include/",
                 "//webrtc/modules/audio_coding/include/",
                 "//webrtc/modules/include/",
                 "//webrtc/modules/audio_conference_mixer/include/",
                 "//webrtc/modules/include/",
                 "//webrtc/modules/include/",
                 "//webrtc/modules/audio_device/include/",
                 "//webrtc/modules/audio_device/dummy/"
             ],
             "libs": [
-                "log",
-                "OpenSLES"
+                "log"
             ],
             "sources": [
                 "//webrtc/build/no_op_function.cc",
                 "//webrtc/call.h",
                 "//webrtc/config.h"
             ],
             "type": "static_library"
         },
@@ -8881,31 +8776,30 @@
                 "HAVE_SYS_UIO_H",
                 "ANDROID_NDK_VERSION=r12b",
                 "_FORTIFY_SOURCE=2",
                 "__GNU_SOURCE=1",
                 "NDEBUG",