diff --git a/media/libaom/generate_sources_mozbuild.py b/media/libaom/generate_sources_mozbuild.py
index a5a75d8be..2f89c9948 100644
--- a/media/libaom/generate_sources_mozbuild.py
+++ b/media/libaom/generate_sources_mozbuild.py
@@ -9,7 +9,7 @@ import os
 import re
 import subprocess
 
-AOM_DIR = '../../third_party/aom'
+AOM_DIR = '/media/libaom/src'
 
 def write_aom_config(system, arch, variables, cache_variables):
     # read template cmake file
diff --git a/media/libaom/generate_sources_mozbuild.sh b/media/libaom/generate_sources_mozbuild.sh
index fc12b7230..d712d145d 100644
--- a/media/libaom/generate_sources_mozbuild.sh
+++ b/media/libaom/generate_sources_mozbuild.sh
@@ -15,7 +15,7 @@
 
 export LC_ALL=C
 BASE_DIR=$(pwd)
-LIBAOM_SRC_DIR="../../third_party/aom"
+LIBAOM_SRC_DIR="/media/libaom/src"
 LIBAOM_CONFIG_DIR="config"
 
 # Print license header.
diff --git a/media/libaom/moz.build b/media/libaom/moz.build
index e376878cc..f2d122d76 100644
--- a/media/libaom/moz.build
+++ b/media/libaom/moz.build
@@ -134,10 +134,10 @@ if CONFIG['CLANG_CXX'] or CONFIG['CLANG_CL']:
 ASFLAGS += CONFIG['VPX_ASFLAGS']
 ASFLAGS += [
     '-I.',
-    '-I%s/third_party/aom' % TOPSRCDIR,
+    '-I%s/media/libaom/src' % TOPSRCDIR,
 ]
 
 LOCAL_INCLUDES += [
     '/media/libaom/config', # aom_version.h
-    '/third_party/aom',
+    '/media/libaom/src',
 ]
diff --git a/media/libaom/sources.mozbuild b/media/libaom/sources.mozbuild
index 9aff837c4..939637637 100644
--- a/media/libaom/sources.mozbuild
+++ b/media/libaom/sources.mozbuild
@@ -2,532 +2,532 @@
 
 files = {
   'ARM_EXPORTS': [
-    '../../third_party/aom/aom/aom.h',
-    '../../third_party/aom/aom/aom_codec.h',
-    '../../third_party/aom/aom/aom_decoder.h',
-    '../../third_party/aom/aom/aom_encoder.h',
-    '../../third_party/aom/aom/aom_frame_buffer.h',
-    '../../third_party/aom/aom/aom_image.h',
-    '../../third_party/aom/aom/aom_integer.h',
-    '../../third_party/aom/aom/aomcx.h',
-    '../../third_party/aom/aom/aomdx.h',
-    '../../third_party/aom/aom_mem/aom_mem.h',
-    '../../third_party/aom/aom_ports/aom_timer.h',
-    '../../third_party/aom/aom_ports/arm.h',
-    '../../third_party/aom/aom_ports/bitops.h',
-    '../../third_party/aom/aom_ports/mem.h',
-    '../../third_party/aom/aom_ports/sanitizer.h',
-    '../../third_party/aom/aom_ports/system_state.h',
-    '../../third_party/aom/aom_scale/aom_scale.h',
-    '../../third_party/aom/aom_scale/yv12config.h',
+    '/media/libaom/src/aom/aom.h',
+    '/media/libaom/src/aom/aom_codec.h',
+    '/media/libaom/src/aom/aom_decoder.h',
+    '/media/libaom/src/aom/aom_encoder.h',
+    '/media/libaom/src/aom/aom_frame_buffer.h',
+    '/media/libaom/src/aom/aom_image.h',
+    '/media/libaom/src/aom/aom_integer.h',
+    '/media/libaom/src/aom/aomcx.h',
+    '/media/libaom/src/aom/aomdx.h',
+    '/media/libaom/src/aom_mem/aom_mem.h',
+    '/media/libaom/src/aom_ports/aom_timer.h',
+    '/media/libaom/src/aom_ports/arm.h',
+    '/media/libaom/src/aom_ports/bitops.h',
+    '/media/libaom/src/aom_ports/mem.h',
+    '/media/libaom/src/aom_ports/sanitizer.h',
+    '/media/libaom/src/aom_ports/system_state.h',
+    '/media/libaom/src/aom_scale/aom_scale.h',
+    '/media/libaom/src/aom_scale/yv12config.h',
   ],
   'ARM_SOURCES': [
-    '../../third_party/aom/aom/src/aom_codec.c',
-    '../../third_party/aom/aom/src/aom_decoder.c',
-    '../../third_party/aom/aom/src/aom_encoder.c',
-    '../../third_party/aom/aom/src/aom_image.c',
-    '../../third_party/aom/aom/src/aom_integer.c',
-    '../../third_party/aom/aom_dsp/aom_convolve.c',
-    '../../third_party/aom/aom_dsp/aom_dsp_rtcd.c',
-    '../../third_party/aom/aom_dsp/arm/blend_a64_mask_neon.c',
-    '../../third_party/aom/aom_dsp/arm/fwd_txfm_neon.c',
-    '../../third_party/aom/aom_dsp/arm/intrapred_neon.c',
-    '../../third_party/aom/aom_dsp/arm/loopfilter_neon.c',
-    '../../third_party/aom/aom_dsp/arm/subtract_neon.c',
-    '../../third_party/aom/aom_dsp/binary_codes_reader.c',
-    '../../third_party/aom/aom_dsp/bitreader_buffer.c',
-    '../../third_party/aom/aom_dsp/bitwriter_buffer.c',
-    '../../third_party/aom/aom_dsp/blend_a64_hmask.c',
-    '../../third_party/aom/aom_dsp/blend_a64_mask.c',
-    '../../third_party/aom/aom_dsp/blend_a64_vmask.c',
-    '../../third_party/aom/aom_dsp/daalaboolreader.c',
-    '../../third_party/aom/aom_dsp/entcode.c',
-    '../../third_party/aom/aom_dsp/entdec.c',
-    '../../third_party/aom/aom_dsp/fft.c',
-    '../../third_party/aom/aom_dsp/grain_synthesis.c',
-    '../../third_party/aom/aom_dsp/intrapred.c',
-    '../../third_party/aom/aom_dsp/loopfilter.c',
-    '../../third_party/aom/aom_dsp/subtract.c',
-    '../../third_party/aom/aom_mem/aom_mem.c',
-    '../../third_party/aom/aom_ports/arm_cpudetect.c',
-    '../../third_party/aom/aom_scale/aom_scale_rtcd.c',
-    '../../third_party/aom/aom_scale/generic/aom_scale.c',
-    '../../third_party/aom/aom_scale/generic/gen_scalers.c',
-    '../../third_party/aom/aom_scale/generic/yv12config.c',
-    '../../third_party/aom/aom_scale/generic/yv12extend.c',
-    '../../third_party/aom/aom_util/aom_thread.c',
-    '../../third_party/aom/aom_util/debug_util.c',
-    '../../third_party/aom/av1/av1_dx_iface.c',
-    '../../third_party/aom/av1/common/alloccommon.c',
-    '../../third_party/aom/av1/common/arm/av1_inv_txfm_neon.c',
-    '../../third_party/aom/av1/common/arm/av1_txfm_neon.c',
-    '../../third_party/aom/av1/common/arm/blend_a64_hmask_neon.c',
-    '../../third_party/aom/av1/common/arm/blend_a64_vmask_neon.c',
-    '../../third_party/aom/av1/common/arm/cfl_neon.c',
-    '../../third_party/aom/av1/common/arm/convolve_neon.c',
-    '../../third_party/aom/av1/common/arm/jnt_convolve_neon.c',
-    '../../third_party/aom/av1/common/arm/reconinter_neon.c',
-    '../../third_party/aom/av1/common/arm/selfguided_neon.c',
-    '../../third_party/aom/av1/common/arm/warp_plane_neon.c',
-    '../../third_party/aom/av1/common/arm/wiener_convolve_neon.c',
-    '../../third_party/aom/av1/common/av1_inv_txfm1d.c',
-    '../../third_party/aom/av1/common/av1_inv_txfm2d.c',
-    '../../third_party/aom/av1/common/av1_loopfilter.c',
-    '../../third_party/aom/av1/common/av1_rtcd.c',
-    '../../third_party/aom/av1/common/av1_txfm.c',
-    '../../third_party/aom/av1/common/blockd.c',
-    '../../third_party/aom/av1/common/cdef.c',
-    '../../third_party/aom/av1/common/cdef_block.c',
-    '../../third_party/aom/av1/common/cdef_block_neon.c',
-    '../../third_party/aom/av1/common/cfl.c',
-    '../../third_party/aom/av1/common/convolve.c',
-    '../../third_party/aom/av1/common/debugmodes.c',
-    '../../third_party/aom/av1/common/entropy.c',
-    '../../third_party/aom/av1/common/entropymode.c',
-    '../../third_party/aom/av1/common/entropymv.c',
-    '../../third_party/aom/av1/common/frame_buffers.c',
-    '../../third_party/aom/av1/common/idct.c',
-    '../../third_party/aom/av1/common/mvref_common.c',
-    '../../third_party/aom/av1/common/obu_util.c',
-    '../../third_party/aom/av1/common/odintrin.c',
-    '../../third_party/aom/av1/common/pred_common.c',
-    '../../third_party/aom/av1/common/quant_common.c',
-    '../../third_party/aom/av1/common/reconinter.c',
-    '../../third_party/aom/av1/common/reconintra.c',
-    '../../third_party/aom/av1/common/resize.c',
-    '../../third_party/aom/av1/common/restoration.c',
-    '../../third_party/aom/av1/common/scale.c',
-    '../../third_party/aom/av1/common/scan.c',
-    '../../third_party/aom/av1/common/seg_common.c',
-    '../../third_party/aom/av1/common/thread_common.c',
-    '../../third_party/aom/av1/common/tile_common.c',
-    '../../third_party/aom/av1/common/timing.c',
-    '../../third_party/aom/av1/common/txb_common.c',
-    '../../third_party/aom/av1/common/warped_motion.c',
-    '../../third_party/aom/av1/decoder/decodeframe.c',
-    '../../third_party/aom/av1/decoder/decodemv.c',
-    '../../third_party/aom/av1/decoder/decoder.c',
-    '../../third_party/aom/av1/decoder/decodetxb.c',
-    '../../third_party/aom/av1/decoder/detokenize.c',
-    '../../third_party/aom/av1/decoder/dthread.c',
-    '../../third_party/aom/av1/decoder/obu.c',
-    '../../third_party/aom/av1/encoder/arm/neon/quantize_neon.c',
+    '/media/libaom/src/aom/src/aom_codec.c',
+    '/media/libaom/src/aom/src/aom_decoder.c',
+    '/media/libaom/src/aom/src/aom_encoder.c',
+    '/media/libaom/src/aom/src/aom_image.c',
+    '/media/libaom/src/aom/src/aom_integer.c',
+    '/media/libaom/src/aom_dsp/aom_convolve.c',
+    '/media/libaom/src/aom_dsp/aom_dsp_rtcd.c',
+    '/media/libaom/src/aom_dsp/arm/blend_a64_mask_neon.c',
+    '/media/libaom/src/aom_dsp/arm/fwd_txfm_neon.c',
+    '/media/libaom/src/aom_dsp/arm/intrapred_neon.c',
+    '/media/libaom/src/aom_dsp/arm/loopfilter_neon.c',
+    '/media/libaom/src/aom_dsp/arm/subtract_neon.c',
+    '/media/libaom/src/aom_dsp/binary_codes_reader.c',
+    '/media/libaom/src/aom_dsp/bitreader_buffer.c',
+    '/media/libaom/src/aom_dsp/bitwriter_buffer.c',
+    '/media/libaom/src/aom_dsp/blend_a64_hmask.c',
+    '/media/libaom/src/aom_dsp/blend_a64_mask.c',
+    '/media/libaom/src/aom_dsp/blend_a64_vmask.c',
+    '/media/libaom/src/aom_dsp/daalaboolreader.c',
+    '/media/libaom/src/aom_dsp/entcode.c',
+    '/media/libaom/src/aom_dsp/entdec.c',
+    '/media/libaom/src/aom_dsp/fft.c',
+    '/media/libaom/src/aom_dsp/grain_synthesis.c',
+    '/media/libaom/src/aom_dsp/intrapred.c',
+    '/media/libaom/src/aom_dsp/loopfilter.c',
+    '/media/libaom/src/aom_dsp/subtract.c',
+    '/media/libaom/src/aom_mem/aom_mem.c',
+    '/media/libaom/src/aom_ports/arm_cpudetect.c',
+    '/media/libaom/src/aom_scale/aom_scale_rtcd.c',
+    '/media/libaom/src/aom_scale/generic/aom_scale.c',
+    '/media/libaom/src/aom_scale/generic/gen_scalers.c',
+    '/media/libaom/src/aom_scale/generic/yv12config.c',
+    '/media/libaom/src/aom_scale/generic/yv12extend.c',
+    '/media/libaom/src/aom_util/aom_thread.c',
+    '/media/libaom/src/aom_util/debug_util.c',
+    '/media/libaom/src/av1/av1_dx_iface.c',
+    '/media/libaom/src/av1/common/alloccommon.c',
+    '/media/libaom/src/av1/common/arm/av1_inv_txfm_neon.c',
+    '/media/libaom/src/av1/common/arm/av1_txfm_neon.c',
+    '/media/libaom/src/av1/common/arm/blend_a64_hmask_neon.c',
+    '/media/libaom/src/av1/common/arm/blend_a64_vmask_neon.c',
+    '/media/libaom/src/av1/common/arm/cfl_neon.c',
+    '/media/libaom/src/av1/common/arm/convolve_neon.c',
+    '/media/libaom/src/av1/common/arm/jnt_convolve_neon.c',
+    '/media/libaom/src/av1/common/arm/reconinter_neon.c',
+    '/media/libaom/src/av1/common/arm/selfguided_neon.c',
+    '/media/libaom/src/av1/common/arm/warp_plane_neon.c',
+    '/media/libaom/src/av1/common/arm/wiener_convolve_neon.c',
+    '/media/libaom/src/av1/common/av1_inv_txfm1d.c',
+    '/media/libaom/src/av1/common/av1_inv_txfm2d.c',
+    '/media/libaom/src/av1/common/av1_loopfilter.c',
+    '/media/libaom/src/av1/common/av1_rtcd.c',
+    '/media/libaom/src/av1/common/av1_txfm.c',
+    '/media/libaom/src/av1/common/blockd.c',
+    '/media/libaom/src/av1/common/cdef.c',
+    '/media/libaom/src/av1/common/cdef_block.c',
+    '/media/libaom/src/av1/common/cdef_block_neon.c',
+    '/media/libaom/src/av1/common/cfl.c',
+    '/media/libaom/src/av1/common/convolve.c',
+    '/media/libaom/src/av1/common/debugmodes.c',
+    '/media/libaom/src/av1/common/entropy.c',
+    '/media/libaom/src/av1/common/entropymode.c',
+    '/media/libaom/src/av1/common/entropymv.c',
+    '/media/libaom/src/av1/common/frame_buffers.c',
+    '/media/libaom/src/av1/common/idct.c',
+    '/media/libaom/src/av1/common/mvref_common.c',
+    '/media/libaom/src/av1/common/obu_util.c',
+    '/media/libaom/src/av1/common/odintrin.c',
+    '/media/libaom/src/av1/common/pred_common.c',
+    '/media/libaom/src/av1/common/quant_common.c',
+    '/media/libaom/src/av1/common/reconinter.c',
+    '/media/libaom/src/av1/common/reconintra.c',
+    '/media/libaom/src/av1/common/resize.c',
+    '/media/libaom/src/av1/common/restoration.c',
+    '/media/libaom/src/av1/common/scale.c',
+    '/media/libaom/src/av1/common/scan.c',
+    '/media/libaom/src/av1/common/seg_common.c',
+    '/media/libaom/src/av1/common/thread_common.c',
+    '/media/libaom/src/av1/common/tile_common.c',
+    '/media/libaom/src/av1/common/timing.c',
+    '/media/libaom/src/av1/common/txb_common.c',
+    '/media/libaom/src/av1/common/warped_motion.c',
+    '/media/libaom/src/av1/decoder/decodeframe.c',
+    '/media/libaom/src/av1/decoder/decodemv.c',
+    '/media/libaom/src/av1/decoder/decoder.c',
+    '/media/libaom/src/av1/decoder/decodetxb.c',
+    '/media/libaom/src/av1/decoder/detokenize.c',
+    '/media/libaom/src/av1/decoder/dthread.c',
+    '/media/libaom/src/av1/decoder/obu.c',
+    '/media/libaom/src/av1/encoder/arm/neon/quantize_neon.c',
   ],
   'GENERIC_EXPORTS': [
-    '../../third_party/aom/aom/aom.h',
-    '../../third_party/aom/aom/aom_codec.h',
-    '../../third_party/aom/aom/aom_decoder.h',
-    '../../third_party/aom/aom/aom_encoder.h',
-    '../../third_party/aom/aom/aom_frame_buffer.h',
-    '../../third_party/aom/aom/aom_image.h',
-    '../../third_party/aom/aom/aom_integer.h',
-    '../../third_party/aom/aom/aomcx.h',
-    '../../third_party/aom/aom/aomdx.h',
-    '../../third_party/aom/aom_mem/aom_mem.h',
-    '../../third_party/aom/aom_ports/aom_timer.h',
-    '../../third_party/aom/aom_ports/bitops.h',
-    '../../third_party/aom/aom_ports/mem.h',
-    '../../third_party/aom/aom_ports/sanitizer.h',
-    '../../third_party/aom/aom_ports/system_state.h',
-    '../../third_party/aom/aom_scale/aom_scale.h',
-    '../../third_party/aom/aom_scale/yv12config.h',
+    '/media/libaom/src/aom/aom.h',
+    '/media/libaom/src/aom/aom_codec.h',
+    '/media/libaom/src/aom/aom_decoder.h',
+    '/media/libaom/src/aom/aom_encoder.h',
+    '/media/libaom/src/aom/aom_frame_buffer.h',
+    '/media/libaom/src/aom/aom_image.h',
+    '/media/libaom/src/aom/aom_integer.h',
+    '/media/libaom/src/aom/aomcx.h',
+    '/media/libaom/src/aom/aomdx.h',
+    '/media/libaom/src/aom_mem/aom_mem.h',
+    '/media/libaom/src/aom_ports/aom_timer.h',
+    '/media/libaom/src/aom_ports/bitops.h',
+    '/media/libaom/src/aom_ports/mem.h',
+    '/media/libaom/src/aom_ports/sanitizer.h',
+    '/media/libaom/src/aom_ports/system_state.h',
+    '/media/libaom/src/aom_scale/aom_scale.h',
+    '/media/libaom/src/aom_scale/yv12config.h',
   ],
   'GENERIC_SOURCES': [
-    '../../third_party/aom/aom/src/aom_codec.c',
-    '../../third_party/aom/aom/src/aom_decoder.c',
-    '../../third_party/aom/aom/src/aom_encoder.c',
-    '../../third_party/aom/aom/src/aom_image.c',
-    '../../third_party/aom/aom/src/aom_integer.c',
-    '../../third_party/aom/aom_dsp/aom_convolve.c',
-    '../../third_party/aom/aom_dsp/aom_dsp_rtcd.c',
-    '../../third_party/aom/aom_dsp/binary_codes_reader.c',
-    '../../third_party/aom/aom_dsp/bitreader_buffer.c',
-    '../../third_party/aom/aom_dsp/bitwriter_buffer.c',
-    '../../third_party/aom/aom_dsp/blend_a64_hmask.c',
-    '../../third_party/aom/aom_dsp/blend_a64_mask.c',
-    '../../third_party/aom/aom_dsp/blend_a64_vmask.c',
-    '../../third_party/aom/aom_dsp/daalaboolreader.c',
-    '../../third_party/aom/aom_dsp/entcode.c',
-    '../../third_party/aom/aom_dsp/entdec.c',
-    '../../third_party/aom/aom_dsp/fft.c',
-    '../../third_party/aom/aom_dsp/grain_synthesis.c',
-    '../../third_party/aom/aom_dsp/intrapred.c',
-    '../../third_party/aom/aom_dsp/loopfilter.c',
-    '../../third_party/aom/aom_dsp/subtract.c',
-    '../../third_party/aom/aom_mem/aom_mem.c',
-    '../../third_party/aom/aom_scale/aom_scale_rtcd.c',
-    '../../third_party/aom/aom_scale/generic/aom_scale.c',
-    '../../third_party/aom/aom_scale/generic/gen_scalers.c',
-    '../../third_party/aom/aom_scale/generic/yv12config.c',
-    '../../third_party/aom/aom_scale/generic/yv12extend.c',
-    '../../third_party/aom/aom_util/aom_thread.c',
-    '../../third_party/aom/aom_util/debug_util.c',
-    '../../third_party/aom/av1/av1_dx_iface.c',
-    '../../third_party/aom/av1/common/alloccommon.c',
-    '../../third_party/aom/av1/common/av1_inv_txfm1d.c',
-    '../../third_party/aom/av1/common/av1_inv_txfm2d.c',
-    '../../third_party/aom/av1/common/av1_loopfilter.c',
-    '../../third_party/aom/av1/common/av1_rtcd.c',
-    '../../third_party/aom/av1/common/av1_txfm.c',
-    '../../third_party/aom/av1/common/blockd.c',
-    '../../third_party/aom/av1/common/cdef.c',
-    '../../third_party/aom/av1/common/cdef_block.c',
-    '../../third_party/aom/av1/common/cfl.c',
-    '../../third_party/aom/av1/common/convolve.c',
-    '../../third_party/aom/av1/common/debugmodes.c',
-    '../../third_party/aom/av1/common/entropy.c',
-    '../../third_party/aom/av1/common/entropymode.c',
-    '../../third_party/aom/av1/common/entropymv.c',
-    '../../third_party/aom/av1/common/frame_buffers.c',
-    '../../third_party/aom/av1/common/idct.c',
-    '../../third_party/aom/av1/common/mvref_common.c',
-    '../../third_party/aom/av1/common/obu_util.c',
-    '../../third_party/aom/av1/common/odintrin.c',
-    '../../third_party/aom/av1/common/pred_common.c',
-    '../../third_party/aom/av1/common/quant_common.c',
-    '../../third_party/aom/av1/common/reconinter.c',
-    '../../third_party/aom/av1/common/reconintra.c',
-    '../../third_party/aom/av1/common/resize.c',
-    '../../third_party/aom/av1/common/restoration.c',
-    '../../third_party/aom/av1/common/scale.c',
-    '../../third_party/aom/av1/common/scan.c',
-    '../../third_party/aom/av1/common/seg_common.c',
-    '../../third_party/aom/av1/common/thread_common.c',
-    '../../third_party/aom/av1/common/tile_common.c',
-    '../../third_party/aom/av1/common/timing.c',
-    '../../third_party/aom/av1/common/txb_common.c',
-    '../../third_party/aom/av1/common/warped_motion.c',
-    '../../third_party/aom/av1/decoder/decodeframe.c',
-    '../../third_party/aom/av1/decoder/decodemv.c',
-    '../../third_party/aom/av1/decoder/decoder.c',
-    '../../third_party/aom/av1/decoder/decodetxb.c',
-    '../../third_party/aom/av1/decoder/detokenize.c',
-    '../../third_party/aom/av1/decoder/dthread.c',
-    '../../third_party/aom/av1/decoder/obu.c',
+    '/media/libaom/src/aom/src/aom_codec.c',
+    '/media/libaom/src/aom/src/aom_decoder.c',
+    '/media/libaom/src/aom/src/aom_encoder.c',
+    '/media/libaom/src/aom/src/aom_image.c',
+    '/media/libaom/src/aom/src/aom_integer.c',
+    '/media/libaom/src/aom_dsp/aom_convolve.c',
+    '/media/libaom/src/aom_dsp/aom_dsp_rtcd.c',
+    '/media/libaom/src/aom_dsp/binary_codes_reader.c',
+    '/media/libaom/src/aom_dsp/bitreader_buffer.c',
+    '/media/libaom/src/aom_dsp/bitwriter_buffer.c',
+    '/media/libaom/src/aom_dsp/blend_a64_hmask.c',
+    '/media/libaom/src/aom_dsp/blend_a64_mask.c',
+    '/media/libaom/src/aom_dsp/blend_a64_vmask.c',
+    '/media/libaom/src/aom_dsp/daalaboolreader.c',
+    '/media/libaom/src/aom_dsp/entcode.c',
+    '/media/libaom/src/aom_dsp/entdec.c',
+    '/media/libaom/src/aom_dsp/fft.c',
+    '/media/libaom/src/aom_dsp/grain_synthesis.c',
+    '/media/libaom/src/aom_dsp/intrapred.c',
+    '/media/libaom/src/aom_dsp/loopfilter.c',
+    '/media/libaom/src/aom_dsp/subtract.c',
+    '/media/libaom/src/aom_mem/aom_mem.c',
+    '/media/libaom/src/aom_scale/aom_scale_rtcd.c',
+    '/media/libaom/src/aom_scale/generic/aom_scale.c',
+    '/media/libaom/src/aom_scale/generic/gen_scalers.c',
+    '/media/libaom/src/aom_scale/generic/yv12config.c',
+    '/media/libaom/src/aom_scale/generic/yv12extend.c',
+    '/media/libaom/src/aom_util/aom_thread.c',
+    '/media/libaom/src/aom_util/debug_util.c',
+    '/media/libaom/src/av1/av1_dx_iface.c',
+    '/media/libaom/src/av1/common/alloccommon.c',
+    '/media/libaom/src/av1/common/av1_inv_txfm1d.c',
+    '/media/libaom/src/av1/common/av1_inv_txfm2d.c',
+    '/media/libaom/src/av1/common/av1_loopfilter.c',
+    '/media/libaom/src/av1/common/av1_rtcd.c',
+    '/media/libaom/src/av1/common/av1_txfm.c',
+    '/media/libaom/src/av1/common/blockd.c',
+    '/media/libaom/src/av1/common/cdef.c',
+    '/media/libaom/src/av1/common/cdef_block.c',
+    '/media/libaom/src/av1/common/cfl.c',
+    '/media/libaom/src/av1/common/convolve.c',
+    '/media/libaom/src/av1/common/debugmodes.c',
+    '/media/libaom/src/av1/common/entropy.c',
+    '/media/libaom/src/av1/common/entropymode.c',
+    '/media/libaom/src/av1/common/entropymv.c',
+    '/media/libaom/src/av1/common/frame_buffers.c',
+    '/media/libaom/src/av1/common/idct.c',
+    '/media/libaom/src/av1/common/mvref_common.c',
+    '/media/libaom/src/av1/common/obu_util.c',
+    '/media/libaom/src/av1/common/odintrin.c',
+    '/media/libaom/src/av1/common/pred_common.c',
+    '/media/libaom/src/av1/common/quant_common.c',
+    '/media/libaom/src/av1/common/reconinter.c',
+    '/media/libaom/src/av1/common/reconintra.c',
+    '/media/libaom/src/av1/common/resize.c',
+    '/media/libaom/src/av1/common/restoration.c',
+    '/media/libaom/src/av1/common/scale.c',
+    '/media/libaom/src/av1/common/scan.c',
+    '/media/libaom/src/av1/common/seg_common.c',
+    '/media/libaom/src/av1/common/thread_common.c',
+    '/media/libaom/src/av1/common/tile_common.c',
+    '/media/libaom/src/av1/common/timing.c',
+    '/media/libaom/src/av1/common/txb_common.c',
+    '/media/libaom/src/av1/common/warped_motion.c',
+    '/media/libaom/src/av1/decoder/decodeframe.c',
+    '/media/libaom/src/av1/decoder/decodemv.c',
+    '/media/libaom/src/av1/decoder/decoder.c',
+    '/media/libaom/src/av1/decoder/decodetxb.c',
+    '/media/libaom/src/av1/decoder/detokenize.c',
+    '/media/libaom/src/av1/decoder/dthread.c',
+    '/media/libaom/src/av1/decoder/obu.c',
   ],
   'IA32_EXPORTS': [
-    '../../third_party/aom/aom/aom.h',
-    '../../third_party/aom/aom/aom_codec.h',
-    '../../third_party/aom/aom/aom_decoder.h',
-    '../../third_party/aom/aom/aom_encoder.h',
-    '../../third_party/aom/aom/aom_frame_buffer.h',
-    '../../third_party/aom/aom/aom_image.h',
-    '../../third_party/aom/aom/aom_integer.h',
-    '../../third_party/aom/aom/aomcx.h',
-    '../../third_party/aom/aom/aomdx.h',
-    '../../third_party/aom/aom_mem/aom_mem.h',
-    '../../third_party/aom/aom_ports/aom_timer.h',
-    '../../third_party/aom/aom_ports/bitops.h',
-    '../../third_party/aom/aom_ports/mem.h',
-    '../../third_party/aom/aom_ports/sanitizer.h',
-    '../../third_party/aom/aom_ports/system_state.h',
-    '../../third_party/aom/aom_scale/aom_scale.h',
-    '../../third_party/aom/aom_scale/yv12config.h',
+    '/media/libaom/src/aom/aom.h',
+    '/media/libaom/src/aom/aom_codec.h',
+    '/media/libaom/src/aom/aom_decoder.h',
+    '/media/libaom/src/aom/aom_encoder.h',
+    '/media/libaom/src/aom/aom_frame_buffer.h',
+    '/media/libaom/src/aom/aom_image.h',
+    '/media/libaom/src/aom/aom_integer.h',
+    '/media/libaom/src/aom/aomcx.h',
+    '/media/libaom/src/aom/aomdx.h',
+    '/media/libaom/src/aom_mem/aom_mem.h',
+    '/media/libaom/src/aom_ports/aom_timer.h',
+    '/media/libaom/src/aom_ports/bitops.h',
+    '/media/libaom/src/aom_ports/mem.h',
+    '/media/libaom/src/aom_ports/sanitizer.h',
+    '/media/libaom/src/aom_ports/system_state.h',
+    '/media/libaom/src/aom_scale/aom_scale.h',
+    '/media/libaom/src/aom_scale/yv12config.h',
   ],
   'IA32_SOURCES': [
-    '../../third_party/aom/aom/src/aom_codec.c',
-    '../../third_party/aom/aom/src/aom_decoder.c',
-    '../../third_party/aom/aom/src/aom_encoder.c',
-    '../../third_party/aom/aom/src/aom_image.c',
-    '../../third_party/aom/aom/src/aom_integer.c',
-    '../../third_party/aom/aom_dsp/aom_convolve.c',
-    '../../third_party/aom/aom_dsp/aom_dsp_rtcd.c',
-    '../../third_party/aom/aom_dsp/binary_codes_reader.c',
-    '../../third_party/aom/aom_dsp/bitreader_buffer.c',
-    '../../third_party/aom/aom_dsp/bitwriter_buffer.c',
-    '../../third_party/aom/aom_dsp/blend_a64_hmask.c',
-    '../../third_party/aom/aom_dsp/blend_a64_mask.c',
-    '../../third_party/aom/aom_dsp/blend_a64_vmask.c',
-    '../../third_party/aom/aom_dsp/daalaboolreader.c',
-    '../../third_party/aom/aom_dsp/entcode.c',
-    '../../third_party/aom/aom_dsp/entdec.c',
-    '../../third_party/aom/aom_dsp/fft.c',
-    '../../third_party/aom/aom_dsp/grain_synthesis.c',
-    '../../third_party/aom/aom_dsp/intrapred.c',
-    '../../third_party/aom/aom_dsp/loopfilter.c',
-    '../../third_party/aom/aom_dsp/subtract.c',
-    '../../third_party/aom/aom_dsp/x86/aom_asm_stubs.c',
-    '../../third_party/aom/aom_dsp/x86/aom_convolve_copy_sse2.asm',
-    '../../third_party/aom/aom_dsp/x86/aom_high_subpixel_8t_sse2.asm',
-    '../../third_party/aom/aom_dsp/x86/aom_high_subpixel_bilinear_sse2.asm',
-    '../../third_party/aom/aom_dsp/x86/aom_subpixel_8t_intrin_avx2.c',
-    '../../third_party/aom/aom_dsp/x86/aom_subpixel_8t_intrin_ssse3.c',
-    '../../third_party/aom/aom_dsp/x86/aom_subpixel_8t_sse2.asm',
-    '../../third_party/aom/aom_dsp/x86/aom_subpixel_8t_ssse3.asm',
-    '../../third_party/aom/aom_dsp/x86/aom_subpixel_bilinear_sse2.asm',
-    '../../third_party/aom/aom_dsp/x86/aom_subpixel_bilinear_ssse3.asm',
-    '../../third_party/aom/aom_dsp/x86/blend_a64_hmask_sse4.c',
-    '../../third_party/aom/aom_dsp/x86/blend_a64_mask_avx2.c',
-    '../../third_party/aom/aom_dsp/x86/blend_a64_mask_sse4.c',
-    '../../third_party/aom/aom_dsp/x86/blend_a64_vmask_sse4.c',
-    '../../third_party/aom/aom_dsp/x86/fft_avx2.c',
-    '../../third_party/aom/aom_dsp/x86/fft_sse2.c',
-    '../../third_party/aom/aom_dsp/x86/highbd_convolve_avx2.c',
-    '../../third_party/aom/aom_dsp/x86/highbd_convolve_ssse3.c',
-    '../../third_party/aom/aom_dsp/x86/highbd_intrapred_sse2.c',
-    '../../third_party/aom/aom_dsp/x86/highbd_intrapred_sse2_asm.asm',
-    '../../third_party/aom/aom_dsp/x86/highbd_loopfilter_avx2.c',
-    '../../third_party/aom/aom_dsp/x86/highbd_loopfilter_sse2.c',
-    '../../third_party/aom/aom_dsp/x86/intrapred_avx2.c',
-    '../../third_party/aom/aom_dsp/x86/intrapred_sse2.c',
-    '../../third_party/aom/aom_dsp/x86/intrapred_sse2_asm.asm',
-    '../../third_party/aom/aom_dsp/x86/intrapred_ssse3.c',
-    '../../third_party/aom/aom_dsp/x86/inv_wht_sse2.asm',
-    '../../third_party/aom/aom_dsp/x86/loopfilter_sse2.c',
-    '../../third_party/aom/aom_mem/aom_mem.c',
-    '../../third_party/aom/aom_ports/emms.asm',
-    '../../third_party/aom/aom_ports/x86_abi_support.asm',
-    '../../third_party/aom/aom_scale/aom_scale_rtcd.c',
-    '../../third_party/aom/aom_scale/generic/aom_scale.c',
-    '../../third_party/aom/aom_scale/generic/gen_scalers.c',
-    '../../third_party/aom/aom_scale/generic/yv12config.c',
-    '../../third_party/aom/aom_scale/generic/yv12extend.c',
-    '../../third_party/aom/aom_util/aom_thread.c',
-    '../../third_party/aom/aom_util/debug_util.c',
-    '../../third_party/aom/av1/av1_dx_iface.c',
-    '../../third_party/aom/av1/common/alloccommon.c',
-    '../../third_party/aom/av1/common/av1_inv_txfm1d.c',
-    '../../third_party/aom/av1/common/av1_inv_txfm2d.c',
-    '../../third_party/aom/av1/common/av1_loopfilter.c',
-    '../../third_party/aom/av1/common/av1_rtcd.c',
-    '../../third_party/aom/av1/common/av1_txfm.c',
-    '../../third_party/aom/av1/common/blockd.c',
-    '../../third_party/aom/av1/common/cdef.c',
-    '../../third_party/aom/av1/common/cdef_block.c',
-    '../../third_party/aom/av1/common/cdef_block_avx2.c',
-    '../../third_party/aom/av1/common/cdef_block_sse2.c',
-    '../../third_party/aom/av1/common/cdef_block_sse4.c',
-    '../../third_party/aom/av1/common/cdef_block_ssse3.c',
-    '../../third_party/aom/av1/common/cfl.c',
-    '../../third_party/aom/av1/common/convolve.c',
-    '../../third_party/aom/av1/common/debugmodes.c',
-    '../../third_party/aom/av1/common/entropy.c',
-    '../../third_party/aom/av1/common/entropymode.c',
-    '../../third_party/aom/av1/common/entropymv.c',
-    '../../third_party/aom/av1/common/frame_buffers.c',
-    '../../third_party/aom/av1/common/idct.c',
-    '../../third_party/aom/av1/common/mvref_common.c',
-    '../../third_party/aom/av1/common/obu_util.c',
-    '../../third_party/aom/av1/common/odintrin.c',
-    '../../third_party/aom/av1/common/pred_common.c',
-    '../../third_party/aom/av1/common/quant_common.c',
-    '../../third_party/aom/av1/common/reconinter.c',
-    '../../third_party/aom/av1/common/reconintra.c',
-    '../../third_party/aom/av1/common/resize.c',
-    '../../third_party/aom/av1/common/restoration.c',
-    '../../third_party/aom/av1/common/scale.c',
-    '../../third_party/aom/av1/common/scan.c',
-    '../../third_party/aom/av1/common/seg_common.c',
-    '../../third_party/aom/av1/common/thread_common.c',
-    '../../third_party/aom/av1/common/tile_common.c',
-    '../../third_party/aom/av1/common/timing.c',
-    '../../third_party/aom/av1/common/txb_common.c',
-    '../../third_party/aom/av1/common/warped_motion.c',
-    '../../third_party/aom/av1/common/x86/av1_convolve_horiz_rs_sse4.c',
-    '../../third_party/aom/av1/common/x86/av1_convolve_scale_sse4.c',
-    '../../third_party/aom/av1/common/x86/av1_highbd_convolve_sse4.c',
-    '../../third_party/aom/av1/common/x86/av1_inv_txfm_avx2.c',
-    '../../third_party/aom/av1/common/x86/av1_inv_txfm_ssse3.c',
-    '../../third_party/aom/av1/common/x86/av1_txfm_sse4.c',
-    '../../third_party/aom/av1/common/x86/cfl_avx2.c',
-    '../../third_party/aom/av1/common/x86/cfl_sse2.c',
-    '../../third_party/aom/av1/common/x86/cfl_ssse3.c',
-    '../../third_party/aom/av1/common/x86/convolve_2d_avx2.c',
-    '../../third_party/aom/av1/common/x86/convolve_2d_sse2.c',
-    '../../third_party/aom/av1/common/x86/convolve_avx2.c',
-    '../../third_party/aom/av1/common/x86/convolve_sse2.c',
-    '../../third_party/aom/av1/common/x86/filterintra_sse4.c',
-    '../../third_party/aom/av1/common/x86/highbd_convolve_2d_avx2.c',
-    '../../third_party/aom/av1/common/x86/highbd_convolve_2d_sse2.c',
-    '../../third_party/aom/av1/common/x86/highbd_convolve_2d_sse4.c',
-    '../../third_party/aom/av1/common/x86/highbd_convolve_2d_ssse3.c',
-    '../../third_party/aom/av1/common/x86/highbd_inv_txfm_avx2.c',
-    '../../third_party/aom/av1/common/x86/highbd_inv_txfm_sse4.c',
-    '../../third_party/aom/av1/common/x86/highbd_jnt_convolve_avx2.c',
-    '../../third_party/aom/av1/common/x86/highbd_jnt_convolve_sse4.c',
-    '../../third_party/aom/av1/common/x86/highbd_warp_plane_sse4.c',
-    '../../third_party/aom/av1/common/x86/highbd_wiener_convolve_avx2.c',
-    '../../third_party/aom/av1/common/x86/highbd_wiener_convolve_ssse3.c',
-    '../../third_party/aom/av1/common/x86/intra_edge_sse4.c',
-    '../../third_party/aom/av1/common/x86/jnt_convolve_avx2.c',
-    '../../third_party/aom/av1/common/x86/jnt_convolve_sse2.c',
-    '../../third_party/aom/av1/common/x86/jnt_convolve_ssse3.c',
-    '../../third_party/aom/av1/common/x86/reconinter_avx2.c',
-    '../../third_party/aom/av1/common/x86/reconinter_sse4.c',
-    '../../third_party/aom/av1/common/x86/reconinter_ssse3.c',
-    '../../third_party/aom/av1/common/x86/selfguided_avx2.c',
-    '../../third_party/aom/av1/common/x86/selfguided_sse4.c',
-    '../../third_party/aom/av1/common/x86/warp_plane_sse4.c',
-    '../../third_party/aom/av1/common/x86/wiener_convolve_avx2.c',
-    '../../third_party/aom/av1/common/x86/wiener_convolve_sse2.c',
-    '../../third_party/aom/av1/decoder/decodeframe.c',
-    '../../third_party/aom/av1/decoder/decodemv.c',
-    '../../third_party/aom/av1/decoder/decoder.c',
-    '../../third_party/aom/av1/decoder/decodetxb.c',
-    '../../third_party/aom/av1/decoder/detokenize.c',
-    '../../third_party/aom/av1/decoder/dthread.c',
-    '../../third_party/aom/av1/decoder/obu.c',
+    '/media/libaom/src/aom/src/aom_codec.c',
+    '/media/libaom/src/aom/src/aom_decoder.c',
+    '/media/libaom/src/aom/src/aom_encoder.c',
+    '/media/libaom/src/aom/src/aom_image.c',
+    '/media/libaom/src/aom/src/aom_integer.c',
+    '/media/libaom/src/aom_dsp/aom_convolve.c',
+    '/media/libaom/src/aom_dsp/aom_dsp_rtcd.c',
+    '/media/libaom/src/aom_dsp/binary_codes_reader.c',
+    '/media/libaom/src/aom_dsp/bitreader_buffer.c',
+    '/media/libaom/src/aom_dsp/bitwriter_buffer.c',
+    '/media/libaom/src/aom_dsp/blend_a64_hmask.c',
+    '/media/libaom/src/aom_dsp/blend_a64_mask.c',
+    '/media/libaom/src/aom_dsp/blend_a64_vmask.c',
+    '/media/libaom/src/aom_dsp/daalaboolreader.c',
+    '/media/libaom/src/aom_dsp/entcode.c',
+    '/media/libaom/src/aom_dsp/entdec.c',
+    '/media/libaom/src/aom_dsp/fft.c',
+    '/media/libaom/src/aom_dsp/grain_synthesis.c',
+    '/media/libaom/src/aom_dsp/intrapred.c',
+    '/media/libaom/src/aom_dsp/loopfilter.c',
+    '/media/libaom/src/aom_dsp/subtract.c',
+    '/media/libaom/src/aom_dsp/x86/aom_asm_stubs.c',
+    '/media/libaom/src/aom_dsp/x86/aom_convolve_copy_sse2.asm',
+    '/media/libaom/src/aom_dsp/x86/aom_high_subpixel_8t_sse2.asm',
+    '/media/libaom/src/aom_dsp/x86/aom_high_subpixel_bilinear_sse2.asm',
+    '/media/libaom/src/aom_dsp/x86/aom_subpixel_8t_intrin_avx2.c',
+    '/media/libaom/src/aom_dsp/x86/aom_subpixel_8t_intrin_ssse3.c',
+    '/media/libaom/src/aom_dsp/x86/aom_subpixel_8t_sse2.asm',
+    '/media/libaom/src/aom_dsp/x86/aom_subpixel_8t_ssse3.asm',
+    '/media/libaom/src/aom_dsp/x86/aom_subpixel_bilinear_sse2.asm',
+    '/media/libaom/src/aom_dsp/x86/aom_subpixel_bilinear_ssse3.asm',
+    '/media/libaom/src/aom_dsp/x86/blend_a64_hmask_sse4.c',
+    '/media/libaom/src/aom_dsp/x86/blend_a64_mask_avx2.c',
+    '/media/libaom/src/aom_dsp/x86/blend_a64_mask_sse4.c',
+    '/media/libaom/src/aom_dsp/x86/blend_a64_vmask_sse4.c',
+    '/media/libaom/src/aom_dsp/x86/fft_avx2.c',
+    '/media/libaom/src/aom_dsp/x86/fft_sse2.c',
+    '/media/libaom/src/aom_dsp/x86/highbd_convolve_avx2.c',
+    '/media/libaom/src/aom_dsp/x86/highbd_convolve_ssse3.c',
+    '/media/libaom/src/aom_dsp/x86/highbd_intrapred_sse2.c',
+    '/media/libaom/src/aom_dsp/x86/highbd_intrapred_sse2_asm.asm',
+    '/media/libaom/src/aom_dsp/x86/highbd_loopfilter_avx2.c',
+    '/media/libaom/src/aom_dsp/x86/highbd_loopfilter_sse2.c',
+    '/media/libaom/src/aom_dsp/x86/intrapred_avx2.c',
+    '/media/libaom/src/aom_dsp/x86/intrapred_sse2.c',
+    '/media/libaom/src/aom_dsp/x86/intrapred_sse2_asm.asm',
+    '/media/libaom/src/aom_dsp/x86/intrapred_ssse3.c',
+    '/media/libaom/src/aom_dsp/x86/inv_wht_sse2.asm',
+    '/media/libaom/src/aom_dsp/x86/loopfilter_sse2.c',
+    '/media/libaom/src/aom_mem/aom_mem.c',
+    '/media/libaom/src/aom_ports/emms.asm',
+    '/media/libaom/src/aom_ports/x86_abi_support.asm',
+    '/media/libaom/src/aom_scale/aom_scale_rtcd.c',
+    '/media/libaom/src/aom_scale/generic/aom_scale.c',
+    '/media/libaom/src/aom_scale/generic/gen_scalers.c',
+    '/media/libaom/src/aom_scale/generic/yv12config.c',
+    '/media/libaom/src/aom_scale/generic/yv12extend.c',
+    '/media/libaom/src/aom_util/aom_thread.c',
+    '/media/libaom/src/aom_util/debug_util.c',
+    '/media/libaom/src/av1/av1_dx_iface.c',
+    '/media/libaom/src/av1/common/alloccommon.c',
+    '/media/libaom/src/av1/common/av1_inv_txfm1d.c',
+    '/media/libaom/src/av1/common/av1_inv_txfm2d.c',
+    '/media/libaom/src/av1/common/av1_loopfilter.c',
+    '/media/libaom/src/av1/common/av1_rtcd.c',
+    '/media/libaom/src/av1/common/av1_txfm.c',
+    '/media/libaom/src/av1/common/blockd.c',
+    '/media/libaom/src/av1/common/cdef.c',
+    '/media/libaom/src/av1/common/cdef_block.c',
+    '/media/libaom/src/av1/common/cdef_block_avx2.c',
+    '/media/libaom/src/av1/common/cdef_block_sse2.c',
+    '/media/libaom/src/av1/common/cdef_block_sse4.c',
+    '/media/libaom/src/av1/common/cdef_block_ssse3.c',
+    '/media/libaom/src/av1/common/cfl.c',
+    '/media/libaom/src/av1/common/convolve.c',
+    '/media/libaom/src/av1/common/debugmodes.c',
+    '/media/libaom/src/av1/common/entropy.c',
+    '/media/libaom/src/av1/common/entropymode.c',
+    '/media/libaom/src/av1/common/entropymv.c',
+    '/media/libaom/src/av1/common/frame_buffers.c',
+    '/media/libaom/src/av1/common/idct.c',
+    '/media/libaom/src/av1/common/mvref_common.c',
+    '/media/libaom/src/av1/common/obu_util.c',
+    '/media/libaom/src/av1/common/odintrin.c',
+    '/media/libaom/src/av1/common/pred_common.c',
+    '/media/libaom/src/av1/common/quant_common.c',
+    '/media/libaom/src/av1/common/reconinter.c',
+    '/media/libaom/src/av1/common/reconintra.c',
+    '/media/libaom/src/av1/common/resize.c',
+    '/media/libaom/src/av1/common/restoration.c',
+    '/media/libaom/src/av1/common/scale.c',
+    '/media/libaom/src/av1/common/scan.c',
+    '/media/libaom/src/av1/common/seg_common.c',
+    '/media/libaom/src/av1/common/thread_common.c',
+    '/media/libaom/src/av1/common/tile_common.c',
+    '/media/libaom/src/av1/common/timing.c',
+    '/media/libaom/src/av1/common/txb_common.c',
+    '/media/libaom/src/av1/common/warped_motion.c',
+    '/media/libaom/src/av1/common/x86/av1_convolve_horiz_rs_sse4.c',
+    '/media/libaom/src/av1/common/x86/av1_convolve_scale_sse4.c',
+    '/media/libaom/src/av1/common/x86/av1_highbd_convolve_sse4.c',
+    '/media/libaom/src/av1/common/x86/av1_inv_txfm_avx2.c',
+    '/media/libaom/src/av1/common/x86/av1_inv_txfm_ssse3.c',
+    '/media/libaom/src/av1/common/x86/av1_txfm_sse4.c',
+    '/media/libaom/src/av1/common/x86/cfl_avx2.c',
+    '/media/libaom/src/av1/common/x86/cfl_sse2.c',
+    '/media/libaom/src/av1/common/x86/cfl_ssse3.c',
+    '/media/libaom/src/av1/common/x86/convolve_2d_avx2.c',
+    '/media/libaom/src/av1/common/x86/convolve_2d_sse2.c',
+    '/media/libaom/src/av1/common/x86/convolve_avx2.c',
+    '/media/libaom/src/av1/common/x86/convolve_sse2.c',
+    '/media/libaom/src/av1/common/x86/filterintra_sse4.c',
+    '/media/libaom/src/av1/common/x86/highbd_convolve_2d_avx2.c',
+    '/media/libaom/src/av1/common/x86/highbd_convolve_2d_sse2.c',
+    '/media/libaom/src/av1/common/x86/highbd_convolve_2d_sse4.c',
+    '/media/libaom/src/av1/common/x86/highbd_convolve_2d_ssse3.c',
+    '/media/libaom/src/av1/common/x86/highbd_inv_txfm_avx2.c',
+    '/media/libaom/src/av1/common/x86/highbd_inv_txfm_sse4.c',
+    '/media/libaom/src/av1/common/x86/highbd_jnt_convolve_avx2.c',
+    '/media/libaom/src/av1/common/x86/highbd_jnt_convolve_sse4.c',
+    '/media/libaom/src/av1/common/x86/highbd_warp_plane_sse4.c',
+    '/media/libaom/src/av1/common/x86/highbd_wiener_convolve_avx2.c',
+    '/media/libaom/src/av1/common/x86/highbd_wiener_convolve_ssse3.c',
+    '/media/libaom/src/av1/common/x86/intra_edge_sse4.c',
+    '/media/libaom/src/av1/common/x86/jnt_convolve_avx2.c',
+    '/media/libaom/src/av1/common/x86/jnt_convolve_sse2.c',
+    '/media/libaom/src/av1/common/x86/jnt_convolve_ssse3.c',
+    '/media/libaom/src/av1/common/x86/reconinter_avx2.c',
+    '/media/libaom/src/av1/common/x86/reconinter_sse4.c',
+    '/media/libaom/src/av1/common/x86/reconinter_ssse3.c',
+    '/media/libaom/src/av1/common/x86/selfguided_avx2.c',
+    '/media/libaom/src/av1/common/x86/selfguided_sse4.c',
+    '/media/libaom/src/av1/common/x86/warp_plane_sse4.c',
+    '/media/libaom/src/av1/common/x86/wiener_convolve_avx2.c',
+    '/media/libaom/src/av1/common/x86/wiener_convolve_sse2.c',
+    '/media/libaom/src/av1/decoder/decodeframe.c',
+    '/media/libaom/src/av1/decoder/decodemv.c',
+    '/media/libaom/src/av1/decoder/decoder.c',
+    '/media/libaom/src/av1/decoder/decodetxb.c',
+    '/media/libaom/src/av1/decoder/detokenize.c',
+    '/media/libaom/src/av1/decoder/dthread.c',
+    '/media/libaom/src/av1/decoder/obu.c',
   ],
   'X64_EXPORTS': [
-    '../../third_party/aom/aom/aom.h',
-    '../../third_party/aom/aom/aom_codec.h',
-    '../../third_party/aom/aom/aom_decoder.h',
-    '../../third_party/aom/aom/aom_encoder.h',
-    '../../third_party/aom/aom/aom_frame_buffer.h',
-    '../../third_party/aom/aom/aom_image.h',
-    '../../third_party/aom/aom/aom_integer.h',
-    '../../third_party/aom/aom/aomcx.h',
-    '../../third_party/aom/aom/aomdx.h',
-    '../../third_party/aom/aom_mem/aom_mem.h',
-    '../../third_party/aom/aom_ports/aom_timer.h',
-    '../../third_party/aom/aom_ports/bitops.h',
-    '../../third_party/aom/aom_ports/mem.h',
-    '../../third_party/aom/aom_ports/sanitizer.h',
-    '../../third_party/aom/aom_ports/system_state.h',
-    '../../third_party/aom/aom_scale/aom_scale.h',
-    '../../third_party/aom/aom_scale/yv12config.h',
+    '/media/libaom/src/aom/aom.h',
+    '/media/libaom/src/aom/aom_codec.h',
+    '/media/libaom/src/aom/aom_decoder.h',
+    '/media/libaom/src/aom/aom_encoder.h',
+    '/media/libaom/src/aom/aom_frame_buffer.h',
+    '/media/libaom/src/aom/aom_image.h',
+    '/media/libaom/src/aom/aom_integer.h',
+    '/media/libaom/src/aom/aomcx.h',
+    '/media/libaom/src/aom/aomdx.h',
+    '/media/libaom/src/aom_mem/aom_mem.h',
+    '/media/libaom/src/aom_ports/aom_timer.h',
+    '/media/libaom/src/aom_ports/bitops.h',
+    '/media/libaom/src/aom_ports/mem.h',
+    '/media/libaom/src/aom_ports/sanitizer.h',
+    '/media/libaom/src/aom_ports/system_state.h',
+    '/media/libaom/src/aom_scale/aom_scale.h',
+    '/media/libaom/src/aom_scale/yv12config.h',
   ],
   'X64_SOURCES': [
-    '../../third_party/aom/aom/src/aom_codec.c',
-    '../../third_party/aom/aom/src/aom_decoder.c',
-    '../../third_party/aom/aom/src/aom_encoder.c',
-    '../../third_party/aom/aom/src/aom_image.c',
-    '../../third_party/aom/aom/src/aom_integer.c',
-    '../../third_party/aom/aom_dsp/aom_convolve.c',
-    '../../third_party/aom/aom_dsp/aom_dsp_rtcd.c',
-    '../../third_party/aom/aom_dsp/binary_codes_reader.c',
-    '../../third_party/aom/aom_dsp/bitreader_buffer.c',
-    '../../third_party/aom/aom_dsp/bitwriter_buffer.c',
-    '../../third_party/aom/aom_dsp/blend_a64_hmask.c',
-    '../../third_party/aom/aom_dsp/blend_a64_mask.c',
-    '../../third_party/aom/aom_dsp/blend_a64_vmask.c',
-    '../../third_party/aom/aom_dsp/daalaboolreader.c',
-    '../../third_party/aom/aom_dsp/entcode.c',
-    '../../third_party/aom/aom_dsp/entdec.c',
-    '../../third_party/aom/aom_dsp/fft.c',
-    '../../third_party/aom/aom_dsp/grain_synthesis.c',
-    '../../third_party/aom/aom_dsp/intrapred.c',
-    '../../third_party/aom/aom_dsp/loopfilter.c',
-    '../../third_party/aom/aom_dsp/subtract.c',
-    '../../third_party/aom/aom_dsp/x86/aom_asm_stubs.c',
-    '../../third_party/aom/aom_dsp/x86/aom_convolve_copy_sse2.asm',
-    '../../third_party/aom/aom_dsp/x86/aom_high_subpixel_8t_sse2.asm',
-    '../../third_party/aom/aom_dsp/x86/aom_high_subpixel_bilinear_sse2.asm',
-    '../../third_party/aom/aom_dsp/x86/aom_subpixel_8t_intrin_avx2.c',
-    '../../third_party/aom/aom_dsp/x86/aom_subpixel_8t_intrin_ssse3.c',
-    '../../third_party/aom/aom_dsp/x86/aom_subpixel_8t_sse2.asm',
-    '../../third_party/aom/aom_dsp/x86/aom_subpixel_8t_ssse3.asm',
-    '../../third_party/aom/aom_dsp/x86/aom_subpixel_bilinear_sse2.asm',
-    '../../third_party/aom/aom_dsp/x86/aom_subpixel_bilinear_ssse3.asm',
-    '../../third_party/aom/aom_dsp/x86/blend_a64_hmask_sse4.c',
-    '../../third_party/aom/aom_dsp/x86/blend_a64_mask_avx2.c',
-    '../../third_party/aom/aom_dsp/x86/blend_a64_mask_sse4.c',
-    '../../third_party/aom/aom_dsp/x86/blend_a64_vmask_sse4.c',
-    '../../third_party/aom/aom_dsp/x86/fft_avx2.c',
-    '../../third_party/aom/aom_dsp/x86/fft_sse2.c',
-    '../../third_party/aom/aom_dsp/x86/highbd_convolve_avx2.c',
-    '../../third_party/aom/aom_dsp/x86/highbd_convolve_ssse3.c',
-    '../../third_party/aom/aom_dsp/x86/highbd_intrapred_sse2.c',
-    '../../third_party/aom/aom_dsp/x86/highbd_intrapred_sse2_asm.asm',
-    '../../third_party/aom/aom_dsp/x86/highbd_loopfilter_avx2.c',
-    '../../third_party/aom/aom_dsp/x86/highbd_loopfilter_sse2.c',
-    '../../third_party/aom/aom_dsp/x86/intrapred_avx2.c',
-    '../../third_party/aom/aom_dsp/x86/intrapred_sse2.c',
-    '../../third_party/aom/aom_dsp/x86/intrapred_sse2_asm.asm',
-    '../../third_party/aom/aom_dsp/x86/intrapred_ssse3.c',
-    '../../third_party/aom/aom_dsp/x86/inv_wht_sse2.asm',
-    '../../third_party/aom/aom_dsp/x86/loopfilter_sse2.c',
-    '../../third_party/aom/aom_mem/aom_mem.c',
-    '../../third_party/aom/aom_ports/emms.asm',
-    '../../third_party/aom/aom_scale/aom_scale_rtcd.c',
-    '../../third_party/aom/aom_scale/generic/aom_scale.c',
-    '../../third_party/aom/aom_scale/generic/gen_scalers.c',
-    '../../third_party/aom/aom_scale/generic/yv12config.c',
-    '../../third_party/aom/aom_scale/generic/yv12extend.c',
-    '../../third_party/aom/aom_util/aom_thread.c',
-    '../../third_party/aom/aom_util/debug_util.c',
-    '../../third_party/aom/av1/av1_dx_iface.c',
-    '../../third_party/aom/av1/common/alloccommon.c',
-    '../../third_party/aom/av1/common/av1_inv_txfm1d.c',
-    '../../third_party/aom/av1/common/av1_inv_txfm2d.c',
-    '../../third_party/aom/av1/common/av1_loopfilter.c',
-    '../../third_party/aom/av1/common/av1_rtcd.c',
-    '../../third_party/aom/av1/common/av1_txfm.c',
-    '../../third_party/aom/av1/common/blockd.c',
-    '../../third_party/aom/av1/common/cdef.c',
-    '../../third_party/aom/av1/common/cdef_block.c',
-    '../../third_party/aom/av1/common/cdef_block_avx2.c',
-    '../../third_party/aom/av1/common/cdef_block_sse2.c',
-    '../../third_party/aom/av1/common/cdef_block_sse4.c',
-    '../../third_party/aom/av1/common/cdef_block_ssse3.c',
-    '../../third_party/aom/av1/common/cfl.c',
-    '../../third_party/aom/av1/common/convolve.c',
-    '../../third_party/aom/av1/common/debugmodes.c',
-    '../../third_party/aom/av1/common/entropy.c',
-    '../../third_party/aom/av1/common/entropymode.c',
-    '../../third_party/aom/av1/common/entropymv.c',
-    '../../third_party/aom/av1/common/frame_buffers.c',
-    '../../third_party/aom/av1/common/idct.c',
-    '../../third_party/aom/av1/common/mvref_common.c',
-    '../../third_party/aom/av1/common/obu_util.c',
-    '../../third_party/aom/av1/common/odintrin.c',
-    '../../third_party/aom/av1/common/pred_common.c',
-    '../../third_party/aom/av1/common/quant_common.c',
-    '../../third_party/aom/av1/common/reconinter.c',
-    '../../third_party/aom/av1/common/reconintra.c',
-    '../../third_party/aom/av1/common/resize.c',
-    '../../third_party/aom/av1/common/restoration.c',
-    '../../third_party/aom/av1/common/scale.c',
-    '../../third_party/aom/av1/common/scan.c',
-    '../../third_party/aom/av1/common/seg_common.c',
-    '../../third_party/aom/av1/common/thread_common.c',
-    '../../third_party/aom/av1/common/tile_common.c',
-    '../../third_party/aom/av1/common/timing.c',
-    '../../third_party/aom/av1/common/txb_common.c',
-    '../../third_party/aom/av1/common/warped_motion.c',
-    '../../third_party/aom/av1/common/x86/av1_convolve_horiz_rs_sse4.c',
-    '../../third_party/aom/av1/common/x86/av1_convolve_scale_sse4.c',
-    '../../third_party/aom/av1/common/x86/av1_highbd_convolve_sse4.c',
-    '../../third_party/aom/av1/common/x86/av1_inv_txfm_avx2.c',
-    '../../third_party/aom/av1/common/x86/av1_inv_txfm_ssse3.c',
-    '../../third_party/aom/av1/common/x86/av1_txfm_sse4.c',
-    '../../third_party/aom/av1/common/x86/cfl_avx2.c',
-    '../../third_party/aom/av1/common/x86/cfl_sse2.c',
-    '../../third_party/aom/av1/common/x86/cfl_ssse3.c',
-    '../../third_party/aom/av1/common/x86/convolve_2d_avx2.c',
-    '../../third_party/aom/av1/common/x86/convolve_2d_sse2.c',
-    '../../third_party/aom/av1/common/x86/convolve_avx2.c',
-    '../../third_party/aom/av1/common/x86/convolve_sse2.c',
-    '../../third_party/aom/av1/common/x86/filterintra_sse4.c',
-    '../../third_party/aom/av1/common/x86/highbd_convolve_2d_avx2.c',
-    '../../third_party/aom/av1/common/x86/highbd_convolve_2d_sse2.c',
-    '../../third_party/aom/av1/common/x86/highbd_convolve_2d_sse4.c',
-    '../../third_party/aom/av1/common/x86/highbd_convolve_2d_ssse3.c',
-    '../../third_party/aom/av1/common/x86/highbd_inv_txfm_avx2.c',
-    '../../third_party/aom/av1/common/x86/highbd_inv_txfm_sse4.c',
-    '../../third_party/aom/av1/common/x86/highbd_jnt_convolve_avx2.c',
-    '../../third_party/aom/av1/common/x86/highbd_jnt_convolve_sse4.c',
-    '../../third_party/aom/av1/common/x86/highbd_warp_plane_sse4.c',
-    '../../third_party/aom/av1/common/x86/highbd_wiener_convolve_avx2.c',
-    '../../third_party/aom/av1/common/x86/highbd_wiener_convolve_ssse3.c',
-    '../../third_party/aom/av1/common/x86/intra_edge_sse4.c',
-    '../../third_party/aom/av1/common/x86/jnt_convolve_avx2.c',
-    '../../third_party/aom/av1/common/x86/jnt_convolve_sse2.c',
-    '../../third_party/aom/av1/common/x86/jnt_convolve_ssse3.c',
-    '../../third_party/aom/av1/common/x86/reconinter_avx2.c',
-    '../../third_party/aom/av1/common/x86/reconinter_sse4.c',
-    '../../third_party/aom/av1/common/x86/reconinter_ssse3.c',
-    '../../third_party/aom/av1/common/x86/selfguided_avx2.c',
-    '../../third_party/aom/av1/common/x86/selfguided_sse4.c',
-    '../../third_party/aom/av1/common/x86/warp_plane_sse4.c',
-    '../../third_party/aom/av1/common/x86/wiener_convolve_avx2.c',
-    '../../third_party/aom/av1/common/x86/wiener_convolve_sse2.c',
-    '../../third_party/aom/av1/decoder/decodeframe.c',
-    '../../third_party/aom/av1/decoder/decodemv.c',
-    '../../third_party/aom/av1/decoder/decoder.c',
-    '../../third_party/aom/av1/decoder/decodetxb.c',
-    '../../third_party/aom/av1/decoder/detokenize.c',
-    '../../third_party/aom/av1/decoder/dthread.c',
-    '../../third_party/aom/av1/decoder/obu.c',
+    '/media/libaom/src/aom/src/aom_codec.c',
+    '/media/libaom/src/aom/src/aom_decoder.c',
+    '/media/libaom/src/aom/src/aom_encoder.c',
+    '/media/libaom/src/aom/src/aom_image.c',
+    '/media/libaom/src/aom/src/aom_integer.c',
+    '/media/libaom/src/aom_dsp/aom_convolve.c',
+    '/media/libaom/src/aom_dsp/aom_dsp_rtcd.c',
+    '/media/libaom/src/aom_dsp/binary_codes_reader.c',
+    '/media/libaom/src/aom_dsp/bitreader_buffer.c',
+    '/media/libaom/src/aom_dsp/bitwriter_buffer.c',
+    '/media/libaom/src/aom_dsp/blend_a64_hmask.c',
+    '/media/libaom/src/aom_dsp/blend_a64_mask.c',
+    '/media/libaom/src/aom_dsp/blend_a64_vmask.c',
+    '/media/libaom/src/aom_dsp/daalaboolreader.c',
+    '/media/libaom/src/aom_dsp/entcode.c',
+    '/media/libaom/src/aom_dsp/entdec.c',
+    '/media/libaom/src/aom_dsp/fft.c',
+    '/media/libaom/src/aom_dsp/grain_synthesis.c',
+    '/media/libaom/src/aom_dsp/intrapred.c',
+    '/media/libaom/src/aom_dsp/loopfilter.c',
+    '/media/libaom/src/aom_dsp/subtract.c',
+    '/media/libaom/src/aom_dsp/x86/aom_asm_stubs.c',
+    '/media/libaom/src/aom_dsp/x86/aom_convolve_copy_sse2.asm',
+    '/media/libaom/src/aom_dsp/x86/aom_high_subpixel_8t_sse2.asm',
+    '/media/libaom/src/aom_dsp/x86/aom_high_subpixel_bilinear_sse2.asm',
+    '/media/libaom/src/aom_dsp/x86/aom_subpixel_8t_intrin_avx2.c',
+    '/media/libaom/src/aom_dsp/x86/aom_subpixel_8t_intrin_ssse3.c',
+    '/media/libaom/src/aom_dsp/x86/aom_subpixel_8t_sse2.asm',
+    '/media/libaom/src/aom_dsp/x86/aom_subpixel_8t_ssse3.asm',
+    '/media/libaom/src/aom_dsp/x86/aom_subpixel_bilinear_sse2.asm',
+    '/media/libaom/src/aom_dsp/x86/aom_subpixel_bilinear_ssse3.asm',
+    '/media/libaom/src/aom_dsp/x86/blend_a64_hmask_sse4.c',
+    '/media/libaom/src/aom_dsp/x86/blend_a64_mask_avx2.c',
+    '/media/libaom/src/aom_dsp/x86/blend_a64_mask_sse4.c',
+    '/media/libaom/src/aom_dsp/x86/blend_a64_vmask_sse4.c',
+    '/media/libaom/src/aom_dsp/x86/fft_avx2.c',
+    '/media/libaom/src/aom_dsp/x86/fft_sse2.c',
+    '/media/libaom/src/aom_dsp/x86/highbd_convolve_avx2.c',
+    '/media/libaom/src/aom_dsp/x86/highbd_convolve_ssse3.c',
+    '/media/libaom/src/aom_dsp/x86/highbd_intrapred_sse2.c',
+    '/media/libaom/src/aom_dsp/x86/highbd_intrapred_sse2_asm.asm',
+    '/media/libaom/src/aom_dsp/x86/highbd_loopfilter_avx2.c',
+    '/media/libaom/src/aom_dsp/x86/highbd_loopfilter_sse2.c',
+    '/media/libaom/src/aom_dsp/x86/intrapred_avx2.c',
+    '/media/libaom/src/aom_dsp/x86/intrapred_sse2.c',
+    '/media/libaom/src/aom_dsp/x86/intrapred_sse2_asm.asm',
+    '/media/libaom/src/aom_dsp/x86/intrapred_ssse3.c',
+    '/media/libaom/src/aom_dsp/x86/inv_wht_sse2.asm',
+    '/media/libaom/src/aom_dsp/x86/loopfilter_sse2.c',
+    '/media/libaom/src/aom_mem/aom_mem.c',
+    '/media/libaom/src/aom_ports/emms.asm',
+    '/media/libaom/src/aom_scale/aom_scale_rtcd.c',
+    '/media/libaom/src/aom_scale/generic/aom_scale.c',
+    '/media/libaom/src/aom_scale/generic/gen_scalers.c',
+    '/media/libaom/src/aom_scale/generic/yv12config.c',
+    '/media/libaom/src/aom_scale/generic/yv12extend.c',
+    '/media/libaom/src/aom_util/aom_thread.c',
+    '/media/libaom/src/aom_util/debug_util.c',
+    '/media/libaom/src/av1/av1_dx_iface.c',
+    '/media/libaom/src/av1/common/alloccommon.c',
+    '/media/libaom/src/av1/common/av1_inv_txfm1d.c',
+    '/media/libaom/src/av1/common/av1_inv_txfm2d.c',
+    '/media/libaom/src/av1/common/av1_loopfilter.c',
+    '/media/libaom/src/av1/common/av1_rtcd.c',
+    '/media/libaom/src/av1/common/av1_txfm.c',
+    '/media/libaom/src/av1/common/blockd.c',
+    '/media/libaom/src/av1/common/cdef.c',
+    '/media/libaom/src/av1/common/cdef_block.c',
+    '/media/libaom/src/av1/common/cdef_block_avx2.c',
+    '/media/libaom/src/av1/common/cdef_block_sse2.c',
+    '/media/libaom/src/av1/common/cdef_block_sse4.c',
+    '/media/libaom/src/av1/common/cdef_block_ssse3.c',
+    '/media/libaom/src/av1/common/cfl.c',
+    '/media/libaom/src/av1/common/convolve.c',
+    '/media/libaom/src/av1/common/debugmodes.c',
+    '/media/libaom/src/av1/common/entropy.c',
+    '/media/libaom/src/av1/common/entropymode.c',
+    '/media/libaom/src/av1/common/entropymv.c',
+    '/media/libaom/src/av1/common/frame_buffers.c',
+    '/media/libaom/src/av1/common/idct.c',
+    '/media/libaom/src/av1/common/mvref_common.c',
+    '/media/libaom/src/av1/common/obu_util.c',
+    '/media/libaom/src/av1/common/odintrin.c',
+    '/media/libaom/src/av1/common/pred_common.c',
+    '/media/libaom/src/av1/common/quant_common.c',
+    '/media/libaom/src/av1/common/reconinter.c',
+    '/media/libaom/src/av1/common/reconintra.c',
+    '/media/libaom/src/av1/common/resize.c',
+    '/media/libaom/src/av1/common/restoration.c',
+    '/media/libaom/src/av1/common/scale.c',
+    '/media/libaom/src/av1/common/scan.c',
+    '/media/libaom/src/av1/common/seg_common.c',
+    '/media/libaom/src/av1/common/thread_common.c',
+    '/media/libaom/src/av1/common/tile_common.c',
+    '/media/libaom/src/av1/common/timing.c',
+    '/media/libaom/src/av1/common/txb_common.c',
+    '/media/libaom/src/av1/common/warped_motion.c',
+    '/media/libaom/src/av1/common/x86/av1_convolve_horiz_rs_sse4.c',
+    '/media/libaom/src/av1/common/x86/av1_convolve_scale_sse4.c',
+    '/media/libaom/src/av1/common/x86/av1_highbd_convolve_sse4.c',
+    '/media/libaom/src/av1/common/x86/av1_inv_txfm_avx2.c',
+    '/media/libaom/src/av1/common/x86/av1_inv_txfm_ssse3.c',
+    '/media/libaom/src/av1/common/x86/av1_txfm_sse4.c',
+    '/media/libaom/src/av1/common/x86/cfl_avx2.c',
+    '/media/libaom/src/av1/common/x86/cfl_sse2.c',
+    '/media/libaom/src/av1/common/x86/cfl_ssse3.c',
+    '/media/libaom/src/av1/common/x86/convolve_2d_avx2.c',
+    '/media/libaom/src/av1/common/x86/convolve_2d_sse2.c',
+    '/media/libaom/src/av1/common/x86/convolve_avx2.c',
+    '/media/libaom/src/av1/common/x86/convolve_sse2.c',
+    '/media/libaom/src/av1/common/x86/filterintra_sse4.c',
+    '/media/libaom/src/av1/common/x86/highbd_convolve_2d_avx2.c',
+    '/media/libaom/src/av1/common/x86/highbd_convolve_2d_sse2.c',
+    '/media/libaom/src/av1/common/x86/highbd_convolve_2d_sse4.c',
+    '/media/libaom/src/av1/common/x86/highbd_convolve_2d_ssse3.c',
+    '/media/libaom/src/av1/common/x86/highbd_inv_txfm_avx2.c',
+    '/media/libaom/src/av1/common/x86/highbd_inv_txfm_sse4.c',
+    '/media/libaom/src/av1/common/x86/highbd_jnt_convolve_avx2.c',
+    '/media/libaom/src/av1/common/x86/highbd_jnt_convolve_sse4.c',
+    '/media/libaom/src/av1/common/x86/highbd_warp_plane_sse4.c',
+    '/media/libaom/src/av1/common/x86/highbd_wiener_convolve_avx2.c',
+    '/media/libaom/src/av1/common/x86/highbd_wiener_convolve_ssse3.c',
+    '/media/libaom/src/av1/common/x86/intra_edge_sse4.c',
+    '/media/libaom/src/av1/common/x86/jnt_convolve_avx2.c',
+    '/media/libaom/src/av1/common/x86/jnt_convolve_sse2.c',
+    '/media/libaom/src/av1/common/x86/jnt_convolve_ssse3.c',
+    '/media/libaom/src/av1/common/x86/reconinter_avx2.c',
+    '/media/libaom/src/av1/common/x86/reconinter_sse4.c',
+    '/media/libaom/src/av1/common/x86/reconinter_ssse3.c',
+    '/media/libaom/src/av1/common/x86/selfguided_avx2.c',
+    '/media/libaom/src/av1/common/x86/selfguided_sse4.c',
+    '/media/libaom/src/av1/common/x86/warp_plane_sse4.c',
+    '/media/libaom/src/av1/common/x86/wiener_convolve_avx2.c',
+    '/media/libaom/src/av1/common/x86/wiener_convolve_sse2.c',
+    '/media/libaom/src/av1/decoder/decodeframe.c',
+    '/media/libaom/src/av1/decoder/decodemv.c',
+    '/media/libaom/src/av1/decoder/decoder.c',
+    '/media/libaom/src/av1/decoder/decodetxb.c',
+    '/media/libaom/src/av1/decoder/detokenize.c',
+    '/media/libaom/src/av1/decoder/dthread.c',
+    '/media/libaom/src/av1/decoder/obu.c',
   ],
 }
diff --git a/third_party/aom/.clang-format b/media/libaom/src/.clang-format
similarity index 100%
rename from third_party/aom/.clang-format
rename to media/libaom/src/.clang-format
diff --git a/third_party/aom/.cmake-format.py b/media/libaom/src/.cmake-format.py
similarity index 100%
rename from third_party/aom/.cmake-format.py
rename to media/libaom/src/.cmake-format.py
diff --git a/third_party/aom/.mailmap b/media/libaom/src/.mailmap
similarity index 100%
rename from third_party/aom/.mailmap
rename to media/libaom/src/.mailmap
diff --git a/third_party/aom/AUTHORS b/media/libaom/src/AUTHORS
similarity index 100%
rename from third_party/aom/AUTHORS
rename to media/libaom/src/AUTHORS
diff --git a/third_party/aom/CHANGELOG b/media/libaom/src/CHANGELOG
similarity index 100%
rename from third_party/aom/CHANGELOG
rename to media/libaom/src/CHANGELOG
diff --git a/third_party/aom/CMakeLists.txt b/media/libaom/src/CMakeLists.txt
similarity index 100%
rename from third_party/aom/CMakeLists.txt
rename to media/libaom/src/CMakeLists.txt
diff --git a/third_party/aom/LICENSE b/media/libaom/src/LICENSE
similarity index 100%
rename from third_party/aom/LICENSE
rename to media/libaom/src/LICENSE
diff --git a/third_party/aom/PATENTS b/media/libaom/src/PATENTS
similarity index 100%
rename from third_party/aom/PATENTS
rename to media/libaom/src/PATENTS
diff --git a/third_party/aom/README.md b/media/libaom/src/README.md
similarity index 100%
rename from third_party/aom/README.md
rename to media/libaom/src/README.md
diff --git a/third_party/aom/aom/aom.h b/media/libaom/src/aom/aom.h
similarity index 100%
rename from third_party/aom/aom/aom.h
rename to media/libaom/src/aom/aom.h
diff --git a/third_party/aom/aom/aom_codec.h b/media/libaom/src/aom/aom_codec.h
similarity index 100%
rename from third_party/aom/aom/aom_codec.h
rename to media/libaom/src/aom/aom_codec.h
diff --git a/third_party/aom/aom/aom_decoder.h b/media/libaom/src/aom/aom_decoder.h
similarity index 100%
rename from third_party/aom/aom/aom_decoder.h
rename to media/libaom/src/aom/aom_decoder.h
diff --git a/third_party/aom/aom/aom_encoder.h b/media/libaom/src/aom/aom_encoder.h
similarity index 100%
rename from third_party/aom/aom/aom_encoder.h
rename to media/libaom/src/aom/aom_encoder.h
diff --git a/third_party/aom/aom/aom_frame_buffer.h b/media/libaom/src/aom/aom_frame_buffer.h
similarity index 100%
rename from third_party/aom/aom/aom_frame_buffer.h
rename to media/libaom/src/aom/aom_frame_buffer.h
diff --git a/third_party/aom/aom/aom_image.h b/media/libaom/src/aom/aom_image.h
similarity index 100%
rename from third_party/aom/aom/aom_image.h
rename to media/libaom/src/aom/aom_image.h
diff --git a/third_party/aom/aom/aom_integer.h b/media/libaom/src/aom/aom_integer.h
similarity index 100%
rename from third_party/aom/aom/aom_integer.h
rename to media/libaom/src/aom/aom_integer.h
diff --git a/third_party/aom/aom/aomcx.h b/media/libaom/src/aom/aomcx.h
similarity index 100%
rename from third_party/aom/aom/aomcx.h
rename to media/libaom/src/aom/aomcx.h
diff --git a/third_party/aom/aom/aomdx.h b/media/libaom/src/aom/aomdx.h
similarity index 100%
rename from third_party/aom/aom/aomdx.h
rename to media/libaom/src/aom/aomdx.h
diff --git a/third_party/aom/aom/exports_com b/media/libaom/src/aom/exports_com
similarity index 100%
rename from third_party/aom/aom/exports_com
rename to media/libaom/src/aom/exports_com
diff --git a/third_party/aom/aom/exports_dec b/media/libaom/src/aom/exports_dec
similarity index 100%
rename from third_party/aom/aom/exports_dec
rename to media/libaom/src/aom/exports_dec
diff --git a/third_party/aom/aom/exports_enc b/media/libaom/src/aom/exports_enc
similarity index 100%
rename from third_party/aom/aom/exports_enc
rename to media/libaom/src/aom/exports_enc
diff --git a/third_party/aom/aom/exports_test b/media/libaom/src/aom/exports_test
similarity index 100%
rename from third_party/aom/aom/exports_test
rename to media/libaom/src/aom/exports_test
diff --git a/third_party/aom/aom/internal/aom_codec_internal.h b/media/libaom/src/aom/internal/aom_codec_internal.h
similarity index 100%
rename from third_party/aom/aom/internal/aom_codec_internal.h
rename to media/libaom/src/aom/internal/aom_codec_internal.h
diff --git a/third_party/aom/aom/src/aom_codec.c b/media/libaom/src/aom/src/aom_codec.c
similarity index 100%
rename from third_party/aom/aom/src/aom_codec.c
rename to media/libaom/src/aom/src/aom_codec.c
diff --git a/third_party/aom/aom/src/aom_decoder.c b/media/libaom/src/aom/src/aom_decoder.c
similarity index 100%
rename from third_party/aom/aom/src/aom_decoder.c
rename to media/libaom/src/aom/src/aom_decoder.c
diff --git a/third_party/aom/aom/src/aom_encoder.c b/media/libaom/src/aom/src/aom_encoder.c
similarity index 100%
rename from third_party/aom/aom/src/aom_encoder.c
rename to media/libaom/src/aom/src/aom_encoder.c
diff --git a/third_party/aom/aom/src/aom_image.c b/media/libaom/src/aom/src/aom_image.c
similarity index 100%
rename from third_party/aom/aom/src/aom_image.c
rename to media/libaom/src/aom/src/aom_image.c
diff --git a/third_party/aom/aom/src/aom_integer.c b/media/libaom/src/aom/src/aom_integer.c
similarity index 100%
rename from third_party/aom/aom/src/aom_integer.c
rename to media/libaom/src/aom/src/aom_integer.c
diff --git a/third_party/aom/aom_dsp/add_noise.c b/media/libaom/src/aom_dsp/add_noise.c
similarity index 100%
rename from third_party/aom/aom_dsp/add_noise.c
rename to media/libaom/src/aom_dsp/add_noise.c
diff --git a/third_party/aom/aom_dsp/aom_convolve.c b/media/libaom/src/aom_dsp/aom_convolve.c
similarity index 100%
rename from third_party/aom/aom_dsp/aom_convolve.c
rename to media/libaom/src/aom_dsp/aom_convolve.c
diff --git a/third_party/aom/aom_dsp/aom_dsp.cmake b/media/libaom/src/aom_dsp/aom_dsp.cmake
similarity index 100%
rename from third_party/aom/aom_dsp/aom_dsp.cmake
rename to media/libaom/src/aom_dsp/aom_dsp.cmake
diff --git a/third_party/aom/aom_dsp/aom_dsp_common.h b/media/libaom/src/aom_dsp/aom_dsp_common.h
similarity index 100%
rename from third_party/aom/aom_dsp/aom_dsp_common.h
rename to media/libaom/src/aom_dsp/aom_dsp_common.h
diff --git a/third_party/aom/aom_dsp/aom_dsp_rtcd.c b/media/libaom/src/aom_dsp/aom_dsp_rtcd.c
similarity index 100%
rename from third_party/aom/aom_dsp/aom_dsp_rtcd.c
rename to media/libaom/src/aom_dsp/aom_dsp_rtcd.c
diff --git a/third_party/aom/aom_dsp/aom_dsp_rtcd_defs.pl b/media/libaom/src/aom_dsp/aom_dsp_rtcd_defs.pl
similarity index 100%
rename from third_party/aom/aom_dsp/aom_dsp_rtcd_defs.pl
rename to media/libaom/src/aom_dsp/aom_dsp_rtcd_defs.pl
diff --git a/third_party/aom/aom_dsp/aom_filter.h b/media/libaom/src/aom_dsp/aom_filter.h
similarity index 100%
rename from third_party/aom/aom_dsp/aom_filter.h
rename to media/libaom/src/aom_dsp/aom_filter.h
diff --git a/third_party/aom/aom_dsp/aom_simd.h b/media/libaom/src/aom_dsp/aom_simd.h
similarity index 100%
rename from third_party/aom/aom_dsp/aom_simd.h
rename to media/libaom/src/aom_dsp/aom_simd.h
diff --git a/third_party/aom/aom_dsp/aom_simd_inline.h b/media/libaom/src/aom_dsp/aom_simd_inline.h
similarity index 100%
rename from third_party/aom/aom_dsp/aom_simd_inline.h
rename to media/libaom/src/aom_dsp/aom_simd_inline.h
diff --git a/third_party/aom/aom_dsp/arm/blend_a64_mask_neon.c b/media/libaom/src/aom_dsp/arm/blend_a64_mask_neon.c
similarity index 100%
rename from third_party/aom/aom_dsp/arm/blend_a64_mask_neon.c
rename to media/libaom/src/aom_dsp/arm/blend_a64_mask_neon.c
diff --git a/third_party/aom/aom_dsp/arm/fwd_txfm_neon.c b/media/libaom/src/aom_dsp/arm/fwd_txfm_neon.c
similarity index 100%
rename from third_party/aom/aom_dsp/arm/fwd_txfm_neon.c
rename to media/libaom/src/aom_dsp/arm/fwd_txfm_neon.c
diff --git a/third_party/aom/aom_dsp/arm/intrapred_neon.c b/media/libaom/src/aom_dsp/arm/intrapred_neon.c
similarity index 100%
rename from third_party/aom/aom_dsp/arm/intrapred_neon.c
rename to media/libaom/src/aom_dsp/arm/intrapred_neon.c
diff --git a/third_party/aom/aom_dsp/arm/loopfilter_neon.c b/media/libaom/src/aom_dsp/arm/loopfilter_neon.c
similarity index 100%
rename from third_party/aom/aom_dsp/arm/loopfilter_neon.c
rename to media/libaom/src/aom_dsp/arm/loopfilter_neon.c
diff --git a/third_party/aom/aom_dsp/arm/sad4d_neon.c b/media/libaom/src/aom_dsp/arm/sad4d_neon.c
similarity index 100%
rename from third_party/aom/aom_dsp/arm/sad4d_neon.c
rename to media/libaom/src/aom_dsp/arm/sad4d_neon.c
diff --git a/third_party/aom/aom_dsp/arm/sad_neon.c b/media/libaom/src/aom_dsp/arm/sad_neon.c
similarity index 100%
rename from third_party/aom/aom_dsp/arm/sad_neon.c
rename to media/libaom/src/aom_dsp/arm/sad_neon.c
diff --git a/third_party/aom/aom_dsp/arm/subpel_variance_neon.c b/media/libaom/src/aom_dsp/arm/subpel_variance_neon.c
similarity index 100%
rename from third_party/aom/aom_dsp/arm/subpel_variance_neon.c
rename to media/libaom/src/aom_dsp/arm/subpel_variance_neon.c
diff --git a/third_party/aom/aom_dsp/arm/subtract_neon.c b/media/libaom/src/aom_dsp/arm/subtract_neon.c
similarity index 100%
rename from third_party/aom/aom_dsp/arm/subtract_neon.c
rename to media/libaom/src/aom_dsp/arm/subtract_neon.c
diff --git a/third_party/aom/aom_dsp/arm/variance_neon.c b/media/libaom/src/aom_dsp/arm/variance_neon.c
similarity index 100%
rename from third_party/aom/aom_dsp/arm/variance_neon.c
rename to media/libaom/src/aom_dsp/arm/variance_neon.c
diff --git a/third_party/aom/aom_dsp/binary_codes_reader.c b/media/libaom/src/aom_dsp/binary_codes_reader.c
similarity index 100%
rename from third_party/aom/aom_dsp/binary_codes_reader.c
rename to media/libaom/src/aom_dsp/binary_codes_reader.c
diff --git a/third_party/aom/aom_dsp/binary_codes_reader.h b/media/libaom/src/aom_dsp/binary_codes_reader.h
similarity index 100%
rename from third_party/aom/aom_dsp/binary_codes_reader.h
rename to media/libaom/src/aom_dsp/binary_codes_reader.h
diff --git a/third_party/aom/aom_dsp/binary_codes_writer.c b/media/libaom/src/aom_dsp/binary_codes_writer.c
similarity index 100%
rename from third_party/aom/aom_dsp/binary_codes_writer.c
rename to media/libaom/src/aom_dsp/binary_codes_writer.c
diff --git a/third_party/aom/aom_dsp/binary_codes_writer.h b/media/libaom/src/aom_dsp/binary_codes_writer.h
similarity index 100%
rename from third_party/aom/aom_dsp/binary_codes_writer.h
rename to media/libaom/src/aom_dsp/binary_codes_writer.h
diff --git a/third_party/aom/aom_dsp/bitreader.h b/media/libaom/src/aom_dsp/bitreader.h
similarity index 100%
rename from third_party/aom/aom_dsp/bitreader.h
rename to media/libaom/src/aom_dsp/bitreader.h
diff --git a/third_party/aom/aom_dsp/bitreader_buffer.c b/media/libaom/src/aom_dsp/bitreader_buffer.c
similarity index 100%
rename from third_party/aom/aom_dsp/bitreader_buffer.c
rename to media/libaom/src/aom_dsp/bitreader_buffer.c
diff --git a/third_party/aom/aom_dsp/bitreader_buffer.h b/media/libaom/src/aom_dsp/bitreader_buffer.h
similarity index 100%
rename from third_party/aom/aom_dsp/bitreader_buffer.h
rename to media/libaom/src/aom_dsp/bitreader_buffer.h
diff --git a/third_party/aom/aom_dsp/bitwriter.h b/media/libaom/src/aom_dsp/bitwriter.h
similarity index 100%
rename from third_party/aom/aom_dsp/bitwriter.h
rename to media/libaom/src/aom_dsp/bitwriter.h
diff --git a/third_party/aom/aom_dsp/bitwriter_buffer.c b/media/libaom/src/aom_dsp/bitwriter_buffer.c
similarity index 100%
rename from third_party/aom/aom_dsp/bitwriter_buffer.c
rename to media/libaom/src/aom_dsp/bitwriter_buffer.c
diff --git a/third_party/aom/aom_dsp/bitwriter_buffer.h b/media/libaom/src/aom_dsp/bitwriter_buffer.h
similarity index 100%
rename from third_party/aom/aom_dsp/bitwriter_buffer.h
rename to media/libaom/src/aom_dsp/bitwriter_buffer.h
diff --git a/third_party/aom/aom_dsp/blend.h b/media/libaom/src/aom_dsp/blend.h
similarity index 100%
rename from third_party/aom/aom_dsp/blend.h
rename to media/libaom/src/aom_dsp/blend.h
diff --git a/third_party/aom/aom_dsp/blend_a64_hmask.c b/media/libaom/src/aom_dsp/blend_a64_hmask.c
similarity index 100%
rename from third_party/aom/aom_dsp/blend_a64_hmask.c
rename to media/libaom/src/aom_dsp/blend_a64_hmask.c
diff --git a/third_party/aom/aom_dsp/blend_a64_mask.c b/media/libaom/src/aom_dsp/blend_a64_mask.c
similarity index 100%
rename from third_party/aom/aom_dsp/blend_a64_mask.c
rename to media/libaom/src/aom_dsp/blend_a64_mask.c
diff --git a/third_party/aom/aom_dsp/blend_a64_vmask.c b/media/libaom/src/aom_dsp/blend_a64_vmask.c
similarity index 100%
rename from third_party/aom/aom_dsp/blend_a64_vmask.c
rename to media/libaom/src/aom_dsp/blend_a64_vmask.c
diff --git a/third_party/aom/aom_dsp/buf_ans.c b/media/libaom/src/aom_dsp/buf_ans.c
similarity index 100%
rename from third_party/aom/aom_dsp/buf_ans.c
rename to media/libaom/src/aom_dsp/buf_ans.c
diff --git a/third_party/aom/aom_dsp/buf_ans.h b/media/libaom/src/aom_dsp/buf_ans.h
similarity index 100%
rename from third_party/aom/aom_dsp/buf_ans.h
rename to media/libaom/src/aom_dsp/buf_ans.h
diff --git a/third_party/aom/aom_dsp/daalaboolreader.c b/media/libaom/src/aom_dsp/daalaboolreader.c
similarity index 100%
rename from third_party/aom/aom_dsp/daalaboolreader.c
rename to media/libaom/src/aom_dsp/daalaboolreader.c
diff --git a/third_party/aom/aom_dsp/daalaboolreader.h b/media/libaom/src/aom_dsp/daalaboolreader.h
similarity index 100%
rename from third_party/aom/aom_dsp/daalaboolreader.h
rename to media/libaom/src/aom_dsp/daalaboolreader.h
diff --git a/third_party/aom/aom_dsp/daalaboolwriter.c b/media/libaom/src/aom_dsp/daalaboolwriter.c
similarity index 100%
rename from third_party/aom/aom_dsp/daalaboolwriter.c
rename to media/libaom/src/aom_dsp/daalaboolwriter.c
diff --git a/third_party/aom/aom_dsp/daalaboolwriter.h b/media/libaom/src/aom_dsp/daalaboolwriter.h
similarity index 100%
rename from third_party/aom/aom_dsp/daalaboolwriter.h
rename to media/libaom/src/aom_dsp/daalaboolwriter.h
diff --git a/third_party/aom/aom_dsp/entcode.c b/media/libaom/src/aom_dsp/entcode.c
similarity index 100%
rename from third_party/aom/aom_dsp/entcode.c
rename to media/libaom/src/aom_dsp/entcode.c
diff --git a/third_party/aom/aom_dsp/entcode.h b/media/libaom/src/aom_dsp/entcode.h
similarity index 100%
rename from third_party/aom/aom_dsp/entcode.h
rename to media/libaom/src/aom_dsp/entcode.h
diff --git a/third_party/aom/aom_dsp/entdec.c b/media/libaom/src/aom_dsp/entdec.c
similarity index 100%
rename from third_party/aom/aom_dsp/entdec.c
rename to media/libaom/src/aom_dsp/entdec.c
diff --git a/third_party/aom/aom_dsp/entdec.h b/media/libaom/src/aom_dsp/entdec.h
similarity index 100%
rename from third_party/aom/aom_dsp/entdec.h
rename to media/libaom/src/aom_dsp/entdec.h
diff --git a/third_party/aom/aom_dsp/entenc.c b/media/libaom/src/aom_dsp/entenc.c
similarity index 100%
rename from third_party/aom/aom_dsp/entenc.c
rename to media/libaom/src/aom_dsp/entenc.c
diff --git a/third_party/aom/aom_dsp/entenc.h b/media/libaom/src/aom_dsp/entenc.h
similarity index 100%
rename from third_party/aom/aom_dsp/entenc.h
rename to media/libaom/src/aom_dsp/entenc.h
diff --git a/third_party/aom/aom_dsp/fastssim.c b/media/libaom/src/aom_dsp/fastssim.c
similarity index 100%
rename from third_party/aom/aom_dsp/fastssim.c
rename to media/libaom/src/aom_dsp/fastssim.c
diff --git a/third_party/aom/aom_dsp/fft.c b/media/libaom/src/aom_dsp/fft.c
similarity index 100%
rename from third_party/aom/aom_dsp/fft.c
rename to media/libaom/src/aom_dsp/fft.c
diff --git a/third_party/aom/aom_dsp/fft_common.h b/media/libaom/src/aom_dsp/fft_common.h
similarity index 100%
rename from third_party/aom/aom_dsp/fft_common.h
rename to media/libaom/src/aom_dsp/fft_common.h
diff --git a/third_party/aom/aom_dsp/fwd_txfm.c b/media/libaom/src/aom_dsp/fwd_txfm.c
similarity index 100%
rename from third_party/aom/aom_dsp/fwd_txfm.c
rename to media/libaom/src/aom_dsp/fwd_txfm.c
diff --git a/third_party/aom/aom_dsp/grain_synthesis.c b/media/libaom/src/aom_dsp/grain_synthesis.c
similarity index 100%
rename from third_party/aom/aom_dsp/grain_synthesis.c
rename to media/libaom/src/aom_dsp/grain_synthesis.c
diff --git a/third_party/aom/aom_dsp/grain_synthesis.h b/media/libaom/src/aom_dsp/grain_synthesis.h
similarity index 100%
rename from third_party/aom/aom_dsp/grain_synthesis.h
rename to media/libaom/src/aom_dsp/grain_synthesis.h
diff --git a/third_party/aom/aom_dsp/grain_table.c b/media/libaom/src/aom_dsp/grain_table.c
similarity index 100%
rename from third_party/aom/aom_dsp/grain_table.c
rename to media/libaom/src/aom_dsp/grain_table.c
diff --git a/third_party/aom/aom_dsp/grain_table.h b/media/libaom/src/aom_dsp/grain_table.h
similarity index 100%
rename from third_party/aom/aom_dsp/grain_table.h
rename to media/libaom/src/aom_dsp/grain_table.h
diff --git a/third_party/aom/aom_dsp/intrapred.c b/media/libaom/src/aom_dsp/intrapred.c
similarity index 100%
rename from third_party/aom/aom_dsp/intrapred.c
rename to media/libaom/src/aom_dsp/intrapred.c
diff --git a/third_party/aom/aom_dsp/intrapred_common.h b/media/libaom/src/aom_dsp/intrapred_common.h
similarity index 100%
rename from third_party/aom/aom_dsp/intrapred_common.h
rename to media/libaom/src/aom_dsp/intrapred_common.h
diff --git a/third_party/aom/aom_dsp/loopfilter.c b/media/libaom/src/aom_dsp/loopfilter.c
similarity index 100%
rename from third_party/aom/aom_dsp/loopfilter.c
rename to media/libaom/src/aom_dsp/loopfilter.c
diff --git a/third_party/aom/aom_dsp/mips/add_noise_msa.c b/media/libaom/src/aom_dsp/mips/add_noise_msa.c
similarity index 100%
rename from third_party/aom/aom_dsp/mips/add_noise_msa.c
rename to media/libaom/src/aom_dsp/mips/add_noise_msa.c
diff --git a/third_party/aom/aom_dsp/mips/aom_convolve8_horiz_msa.c b/media/libaom/src/aom_dsp/mips/aom_convolve8_horiz_msa.c
similarity index 100%
rename from third_party/aom/aom_dsp/mips/aom_convolve8_horiz_msa.c
rename to media/libaom/src/aom_dsp/mips/aom_convolve8_horiz_msa.c
diff --git a/third_party/aom/aom_dsp/mips/aom_convolve8_vert_msa.c b/media/libaom/src/aom_dsp/mips/aom_convolve8_vert_msa.c
similarity index 100%
rename from third_party/aom/aom_dsp/mips/aom_convolve8_vert_msa.c
rename to media/libaom/src/aom_dsp/mips/aom_convolve8_vert_msa.c
diff --git a/third_party/aom/aom_dsp/mips/aom_convolve_copy_msa.c b/media/libaom/src/aom_dsp/mips/aom_convolve_copy_msa.c
similarity index 100%
rename from third_party/aom/aom_dsp/mips/aom_convolve_copy_msa.c
rename to media/libaom/src/aom_dsp/mips/aom_convolve_copy_msa.c
diff --git a/third_party/aom/aom_dsp/mips/aom_convolve_msa.h b/media/libaom/src/aom_dsp/mips/aom_convolve_msa.h
similarity index 100%
rename from third_party/aom/aom_dsp/mips/aom_convolve_msa.h
rename to media/libaom/src/aom_dsp/mips/aom_convolve_msa.h
diff --git a/third_party/aom/aom_dsp/mips/common_dspr2.c b/media/libaom/src/aom_dsp/mips/common_dspr2.c
similarity index 100%
rename from third_party/aom/aom_dsp/mips/common_dspr2.c
rename to media/libaom/src/aom_dsp/mips/common_dspr2.c
diff --git a/third_party/aom/aom_dsp/mips/common_dspr2.h b/media/libaom/src/aom_dsp/mips/common_dspr2.h
similarity index 100%
rename from third_party/aom/aom_dsp/mips/common_dspr2.h
rename to media/libaom/src/aom_dsp/mips/common_dspr2.h
diff --git a/third_party/aom/aom_dsp/mips/convolve2_dspr2.c b/media/libaom/src/aom_dsp/mips/convolve2_dspr2.c
similarity index 100%
rename from third_party/aom/aom_dsp/mips/convolve2_dspr2.c
rename to media/libaom/src/aom_dsp/mips/convolve2_dspr2.c
diff --git a/third_party/aom/aom_dsp/mips/convolve2_horiz_dspr2.c b/media/libaom/src/aom_dsp/mips/convolve2_horiz_dspr2.c
similarity index 100%
rename from third_party/aom/aom_dsp/mips/convolve2_horiz_dspr2.c
rename to media/libaom/src/aom_dsp/mips/convolve2_horiz_dspr2.c
diff --git a/third_party/aom/aom_dsp/mips/convolve2_vert_dspr2.c b/media/libaom/src/aom_dsp/mips/convolve2_vert_dspr2.c
similarity index 100%
rename from third_party/aom/aom_dsp/mips/convolve2_vert_dspr2.c
rename to media/libaom/src/aom_dsp/mips/convolve2_vert_dspr2.c
diff --git a/third_party/aom/aom_dsp/mips/convolve8_dspr2.c b/media/libaom/src/aom_dsp/mips/convolve8_dspr2.c
similarity index 100%
rename from third_party/aom/aom_dsp/mips/convolve8_dspr2.c
rename to media/libaom/src/aom_dsp/mips/convolve8_dspr2.c
diff --git a/third_party/aom/aom_dsp/mips/convolve8_horiz_dspr2.c b/media/libaom/src/aom_dsp/mips/convolve8_horiz_dspr2.c
similarity index 100%
rename from third_party/aom/aom_dsp/mips/convolve8_horiz_dspr2.c
rename to media/libaom/src/aom_dsp/mips/convolve8_horiz_dspr2.c
diff --git a/third_party/aom/aom_dsp/mips/convolve8_vert_dspr2.c b/media/libaom/src/aom_dsp/mips/convolve8_vert_dspr2.c
similarity index 100%
rename from third_party/aom/aom_dsp/mips/convolve8_vert_dspr2.c
rename to media/libaom/src/aom_dsp/mips/convolve8_vert_dspr2.c
diff --git a/third_party/aom/aom_dsp/mips/convolve_common_dspr2.h b/media/libaom/src/aom_dsp/mips/convolve_common_dspr2.h
similarity index 100%
rename from third_party/aom/aom_dsp/mips/convolve_common_dspr2.h
rename to media/libaom/src/aom_dsp/mips/convolve_common_dspr2.h
diff --git a/third_party/aom/aom_dsp/mips/intrapred16_dspr2.c b/media/libaom/src/aom_dsp/mips/intrapred16_dspr2.c
similarity index 100%
rename from third_party/aom/aom_dsp/mips/intrapred16_dspr2.c
rename to media/libaom/src/aom_dsp/mips/intrapred16_dspr2.c
diff --git a/third_party/aom/aom_dsp/mips/intrapred4_dspr2.c b/media/libaom/src/aom_dsp/mips/intrapred4_dspr2.c
similarity index 100%
rename from third_party/aom/aom_dsp/mips/intrapred4_dspr2.c
rename to media/libaom/src/aom_dsp/mips/intrapred4_dspr2.c
diff --git a/third_party/aom/aom_dsp/mips/intrapred8_dspr2.c b/media/libaom/src/aom_dsp/mips/intrapred8_dspr2.c
similarity index 100%
rename from third_party/aom/aom_dsp/mips/intrapred8_dspr2.c
rename to media/libaom/src/aom_dsp/mips/intrapred8_dspr2.c
diff --git a/third_party/aom/aom_dsp/mips/intrapred_msa.c b/media/libaom/src/aom_dsp/mips/intrapred_msa.c
similarity index 100%
rename from third_party/aom/aom_dsp/mips/intrapred_msa.c
rename to media/libaom/src/aom_dsp/mips/intrapred_msa.c
diff --git a/third_party/aom/aom_dsp/mips/loopfilter_16_msa.c b/media/libaom/src/aom_dsp/mips/loopfilter_16_msa.c
similarity index 100%
rename from third_party/aom/aom_dsp/mips/loopfilter_16_msa.c
rename to media/libaom/src/aom_dsp/mips/loopfilter_16_msa.c
diff --git a/third_party/aom/aom_dsp/mips/loopfilter_4_msa.c b/media/libaom/src/aom_dsp/mips/loopfilter_4_msa.c
similarity index 100%
rename from third_party/aom/aom_dsp/mips/loopfilter_4_msa.c
rename to media/libaom/src/aom_dsp/mips/loopfilter_4_msa.c
diff --git a/third_party/aom/aom_dsp/mips/loopfilter_8_msa.c b/media/libaom/src/aom_dsp/mips/loopfilter_8_msa.c
similarity index 100%
rename from third_party/aom/aom_dsp/mips/loopfilter_8_msa.c
rename to media/libaom/src/aom_dsp/mips/loopfilter_8_msa.c
diff --git a/third_party/aom/aom_dsp/mips/loopfilter_filters_dspr2.c b/media/libaom/src/aom_dsp/mips/loopfilter_filters_dspr2.c
similarity index 100%
rename from third_party/aom/aom_dsp/mips/loopfilter_filters_dspr2.c
rename to media/libaom/src/aom_dsp/mips/loopfilter_filters_dspr2.c
diff --git a/third_party/aom/aom_dsp/mips/loopfilter_filters_dspr2.h b/media/libaom/src/aom_dsp/mips/loopfilter_filters_dspr2.h
similarity index 100%
rename from third_party/aom/aom_dsp/mips/loopfilter_filters_dspr2.h
rename to media/libaom/src/aom_dsp/mips/loopfilter_filters_dspr2.h
diff --git a/third_party/aom/aom_dsp/mips/loopfilter_macros_dspr2.h b/media/libaom/src/aom_dsp/mips/loopfilter_macros_dspr2.h
similarity index 100%
rename from third_party/aom/aom_dsp/mips/loopfilter_macros_dspr2.h
rename to media/libaom/src/aom_dsp/mips/loopfilter_macros_dspr2.h
diff --git a/third_party/aom/aom_dsp/mips/loopfilter_masks_dspr2.h b/media/libaom/src/aom_dsp/mips/loopfilter_masks_dspr2.h
similarity index 100%
rename from third_party/aom/aom_dsp/mips/loopfilter_masks_dspr2.h
rename to media/libaom/src/aom_dsp/mips/loopfilter_masks_dspr2.h
diff --git a/third_party/aom/aom_dsp/mips/loopfilter_mb_dspr2.c b/media/libaom/src/aom_dsp/mips/loopfilter_mb_dspr2.c
similarity index 100%
rename from third_party/aom/aom_dsp/mips/loopfilter_mb_dspr2.c
rename to media/libaom/src/aom_dsp/mips/loopfilter_mb_dspr2.c
diff --git a/third_party/aom/aom_dsp/mips/loopfilter_mb_horiz_dspr2.c b/media/libaom/src/aom_dsp/mips/loopfilter_mb_horiz_dspr2.c
similarity index 100%
rename from third_party/aom/aom_dsp/mips/loopfilter_mb_horiz_dspr2.c
rename to media/libaom/src/aom_dsp/mips/loopfilter_mb_horiz_dspr2.c
diff --git a/third_party/aom/aom_dsp/mips/loopfilter_mb_vert_dspr2.c b/media/libaom/src/aom_dsp/mips/loopfilter_mb_vert_dspr2.c
similarity index 100%
rename from third_party/aom/aom_dsp/mips/loopfilter_mb_vert_dspr2.c
rename to media/libaom/src/aom_dsp/mips/loopfilter_mb_vert_dspr2.c
diff --git a/third_party/aom/aom_dsp/mips/loopfilter_msa.h b/media/libaom/src/aom_dsp/mips/loopfilter_msa.h
similarity index 100%
rename from third_party/aom/aom_dsp/mips/loopfilter_msa.h
rename to media/libaom/src/aom_dsp/mips/loopfilter_msa.h
diff --git a/third_party/aom/aom_dsp/mips/macros_msa.h b/media/libaom/src/aom_dsp/mips/macros_msa.h
similarity index 100%
rename from third_party/aom/aom_dsp/mips/macros_msa.h
rename to media/libaom/src/aom_dsp/mips/macros_msa.h
diff --git a/third_party/aom/aom_dsp/mips/sad_msa.c b/media/libaom/src/aom_dsp/mips/sad_msa.c
similarity index 100%
rename from third_party/aom/aom_dsp/mips/sad_msa.c
rename to media/libaom/src/aom_dsp/mips/sad_msa.c
diff --git a/third_party/aom/aom_dsp/mips/sub_pixel_variance_msa.c b/media/libaom/src/aom_dsp/mips/sub_pixel_variance_msa.c
similarity index 100%
rename from third_party/aom/aom_dsp/mips/sub_pixel_variance_msa.c
rename to media/libaom/src/aom_dsp/mips/sub_pixel_variance_msa.c
diff --git a/third_party/aom/aom_dsp/mips/subtract_msa.c b/media/libaom/src/aom_dsp/mips/subtract_msa.c
similarity index 100%
rename from third_party/aom/aom_dsp/mips/subtract_msa.c
rename to media/libaom/src/aom_dsp/mips/subtract_msa.c
diff --git a/third_party/aom/aom_dsp/mips/variance_msa.c b/media/libaom/src/aom_dsp/mips/variance_msa.c
similarity index 100%
rename from third_party/aom/aom_dsp/mips/variance_msa.c
rename to media/libaom/src/aom_dsp/mips/variance_msa.c
diff --git a/third_party/aom/aom_dsp/noise_model.c b/media/libaom/src/aom_dsp/noise_model.c
similarity index 100%
rename from third_party/aom/aom_dsp/noise_model.c
rename to media/libaom/src/aom_dsp/noise_model.c
diff --git a/third_party/aom/aom_dsp/noise_model.h b/media/libaom/src/aom_dsp/noise_model.h
similarity index 100%
rename from third_party/aom/aom_dsp/noise_model.h
rename to media/libaom/src/aom_dsp/noise_model.h
diff --git a/third_party/aom/aom_dsp/noise_util.c b/media/libaom/src/aom_dsp/noise_util.c
similarity index 100%
rename from third_party/aom/aom_dsp/noise_util.c
rename to media/libaom/src/aom_dsp/noise_util.c
diff --git a/third_party/aom/aom_dsp/noise_util.h b/media/libaom/src/aom_dsp/noise_util.h
similarity index 100%
rename from third_party/aom/aom_dsp/noise_util.h
rename to media/libaom/src/aom_dsp/noise_util.h
diff --git a/third_party/aom/aom_dsp/postproc.h b/media/libaom/src/aom_dsp/postproc.h
similarity index 100%
rename from third_party/aom/aom_dsp/postproc.h
rename to media/libaom/src/aom_dsp/postproc.h
diff --git a/third_party/aom/aom_dsp/prob.h b/media/libaom/src/aom_dsp/prob.h
similarity index 100%
rename from third_party/aom/aom_dsp/prob.h
rename to media/libaom/src/aom_dsp/prob.h
diff --git a/third_party/aom/aom_dsp/psnr.c b/media/libaom/src/aom_dsp/psnr.c
similarity index 100%
rename from third_party/aom/aom_dsp/psnr.c
rename to media/libaom/src/aom_dsp/psnr.c
diff --git a/third_party/aom/aom_dsp/psnr.h b/media/libaom/src/aom_dsp/psnr.h
similarity index 100%
rename from third_party/aom/aom_dsp/psnr.h
rename to media/libaom/src/aom_dsp/psnr.h
diff --git a/third_party/aom/aom_dsp/psnrhvs.c b/media/libaom/src/aom_dsp/psnrhvs.c
similarity index 100%
rename from third_party/aom/aom_dsp/psnrhvs.c
rename to media/libaom/src/aom_dsp/psnrhvs.c
diff --git a/third_party/aom/aom_dsp/quantize.c b/media/libaom/src/aom_dsp/quantize.c
similarity index 100%
rename from third_party/aom/aom_dsp/quantize.c
rename to media/libaom/src/aom_dsp/quantize.c
diff --git a/third_party/aom/aom_dsp/quantize.h b/media/libaom/src/aom_dsp/quantize.h
similarity index 100%
rename from third_party/aom/aom_dsp/quantize.h
rename to media/libaom/src/aom_dsp/quantize.h
diff --git a/third_party/aom/aom_dsp/sad.c b/media/libaom/src/aom_dsp/sad.c
similarity index 100%
rename from third_party/aom/aom_dsp/sad.c
rename to media/libaom/src/aom_dsp/sad.c
diff --git a/third_party/aom/aom_dsp/sad_av1.c b/media/libaom/src/aom_dsp/sad_av1.c
similarity index 100%
rename from third_party/aom/aom_dsp/sad_av1.c
rename to media/libaom/src/aom_dsp/sad_av1.c
diff --git a/third_party/aom/aom_dsp/simd/v128_intrinsics.h b/media/libaom/src/aom_dsp/simd/v128_intrinsics.h
similarity index 100%
rename from third_party/aom/aom_dsp/simd/v128_intrinsics.h
rename to media/libaom/src/aom_dsp/simd/v128_intrinsics.h
diff --git a/third_party/aom/aom_dsp/simd/v128_intrinsics_arm.h b/media/libaom/src/aom_dsp/simd/v128_intrinsics_arm.h
similarity index 100%
rename from third_party/aom/aom_dsp/simd/v128_intrinsics_arm.h
rename to media/libaom/src/aom_dsp/simd/v128_intrinsics_arm.h
diff --git a/third_party/aom/aom_dsp/simd/v128_intrinsics_c.h b/media/libaom/src/aom_dsp/simd/v128_intrinsics_c.h
similarity index 100%
rename from third_party/aom/aom_dsp/simd/v128_intrinsics_c.h
rename to media/libaom/src/aom_dsp/simd/v128_intrinsics_c.h
diff --git a/third_party/aom/aom_dsp/simd/v128_intrinsics_x86.h b/media/libaom/src/aom_dsp/simd/v128_intrinsics_x86.h
similarity index 100%
rename from third_party/aom/aom_dsp/simd/v128_intrinsics_x86.h
rename to media/libaom/src/aom_dsp/simd/v128_intrinsics_x86.h
diff --git a/third_party/aom/aom_dsp/simd/v256_intrinsics.h b/media/libaom/src/aom_dsp/simd/v256_intrinsics.h
similarity index 100%
rename from third_party/aom/aom_dsp/simd/v256_intrinsics.h
rename to media/libaom/src/aom_dsp/simd/v256_intrinsics.h
diff --git a/third_party/aom/aom_dsp/simd/v256_intrinsics_arm.h b/media/libaom/src/aom_dsp/simd/v256_intrinsics_arm.h
similarity index 100%
rename from third_party/aom/aom_dsp/simd/v256_intrinsics_arm.h
rename to media/libaom/src/aom_dsp/simd/v256_intrinsics_arm.h
diff --git a/third_party/aom/aom_dsp/simd/v256_intrinsics_c.h b/media/libaom/src/aom_dsp/simd/v256_intrinsics_c.h
similarity index 100%
rename from third_party/aom/aom_dsp/simd/v256_intrinsics_c.h
rename to media/libaom/src/aom_dsp/simd/v256_intrinsics_c.h
diff --git a/third_party/aom/aom_dsp/simd/v256_intrinsics_v128.h b/media/libaom/src/aom_dsp/simd/v256_intrinsics_v128.h
similarity index 100%
rename from third_party/aom/aom_dsp/simd/v256_intrinsics_v128.h
rename to media/libaom/src/aom_dsp/simd/v256_intrinsics_v128.h
diff --git a/third_party/aom/aom_dsp/simd/v256_intrinsics_x86.h b/media/libaom/src/aom_dsp/simd/v256_intrinsics_x86.h
similarity index 100%
rename from third_party/aom/aom_dsp/simd/v256_intrinsics_x86.h
rename to media/libaom/src/aom_dsp/simd/v256_intrinsics_x86.h
diff --git a/third_party/aom/aom_dsp/simd/v64_intrinsics.h b/media/libaom/src/aom_dsp/simd/v64_intrinsics.h
similarity index 100%
rename from third_party/aom/aom_dsp/simd/v64_intrinsics.h
rename to media/libaom/src/aom_dsp/simd/v64_intrinsics.h
diff --git a/third_party/aom/aom_dsp/simd/v64_intrinsics_arm.h b/media/libaom/src/aom_dsp/simd/v64_intrinsics_arm.h
similarity index 100%
rename from third_party/aom/aom_dsp/simd/v64_intrinsics_arm.h
rename to media/libaom/src/aom_dsp/simd/v64_intrinsics_arm.h
diff --git a/third_party/aom/aom_dsp/simd/v64_intrinsics_c.h b/media/libaom/src/aom_dsp/simd/v64_intrinsics_c.h
similarity index 100%
rename from third_party/aom/aom_dsp/simd/v64_intrinsics_c.h
rename to media/libaom/src/aom_dsp/simd/v64_intrinsics_c.h
diff --git a/third_party/aom/aom_dsp/simd/v64_intrinsics_x86.h b/media/libaom/src/aom_dsp/simd/v64_intrinsics_x86.h
similarity index 100%
rename from third_party/aom/aom_dsp/simd/v64_intrinsics_x86.h
rename to media/libaom/src/aom_dsp/simd/v64_intrinsics_x86.h
diff --git a/third_party/aom/aom_dsp/sse.c b/media/libaom/src/aom_dsp/sse.c
similarity index 100%
rename from third_party/aom/aom_dsp/sse.c
rename to media/libaom/src/aom_dsp/sse.c
diff --git a/third_party/aom/aom_dsp/ssim.c b/media/libaom/src/aom_dsp/ssim.c
similarity index 100%
rename from third_party/aom/aom_dsp/ssim.c
rename to media/libaom/src/aom_dsp/ssim.c
diff --git a/third_party/aom/aom_dsp/ssim.h b/media/libaom/src/aom_dsp/ssim.h
similarity index 100%
rename from third_party/aom/aom_dsp/ssim.h
rename to media/libaom/src/aom_dsp/ssim.h
diff --git a/third_party/aom/aom_dsp/subtract.c b/media/libaom/src/aom_dsp/subtract.c
similarity index 100%
rename from third_party/aom/aom_dsp/subtract.c
rename to media/libaom/src/aom_dsp/subtract.c
diff --git a/third_party/aom/aom_dsp/sum_squares.c b/media/libaom/src/aom_dsp/sum_squares.c
similarity index 100%
rename from third_party/aom/aom_dsp/sum_squares.c
rename to media/libaom/src/aom_dsp/sum_squares.c
diff --git a/third_party/aom/aom_dsp/txfm_common.h b/media/libaom/src/aom_dsp/txfm_common.h
similarity index 100%
rename from third_party/aom/aom_dsp/txfm_common.h
rename to media/libaom/src/aom_dsp/txfm_common.h
diff --git a/third_party/aom/aom_dsp/variance.c b/media/libaom/src/aom_dsp/variance.c
similarity index 100%
rename from third_party/aom/aom_dsp/variance.c
rename to media/libaom/src/aom_dsp/variance.c
diff --git a/third_party/aom/aom_dsp/variance.h b/media/libaom/src/aom_dsp/variance.h
similarity index 100%
rename from third_party/aom/aom_dsp/variance.h
rename to media/libaom/src/aom_dsp/variance.h
diff --git a/third_party/aom/aom_dsp/x86/aom_asm_stubs.c b/media/libaom/src/aom_dsp/x86/aom_asm_stubs.c
similarity index 100%
rename from third_party/aom/aom_dsp/x86/aom_asm_stubs.c
rename to media/libaom/src/aom_dsp/x86/aom_asm_stubs.c
diff --git a/third_party/aom/aom_dsp/x86/aom_convolve_copy_sse2.asm b/media/libaom/src/aom_dsp/x86/aom_convolve_copy_sse2.asm
similarity index 100%
rename from third_party/aom/aom_dsp/x86/aom_convolve_copy_sse2.asm
rename to media/libaom/src/aom_dsp/x86/aom_convolve_copy_sse2.asm
diff --git a/third_party/aom/aom_dsp/x86/aom_high_subpixel_8t_sse2.asm b/media/libaom/src/aom_dsp/x86/aom_high_subpixel_8t_sse2.asm
similarity index 100%
rename from third_party/aom/aom_dsp/x86/aom_high_subpixel_8t_sse2.asm
rename to media/libaom/src/aom_dsp/x86/aom_high_subpixel_8t_sse2.asm
diff --git a/third_party/aom/aom_dsp/x86/aom_high_subpixel_bilinear_sse2.asm b/media/libaom/src/aom_dsp/x86/aom_high_subpixel_bilinear_sse2.asm
similarity index 100%
rename from third_party/aom/aom_dsp/x86/aom_high_subpixel_bilinear_sse2.asm
rename to media/libaom/src/aom_dsp/x86/aom_high_subpixel_bilinear_sse2.asm
diff --git a/third_party/aom/aom_dsp/x86/aom_subpixel_8t_intrin_avx2.c b/media/libaom/src/aom_dsp/x86/aom_subpixel_8t_intrin_avx2.c
similarity index 100%
rename from third_party/aom/aom_dsp/x86/aom_subpixel_8t_intrin_avx2.c
rename to media/libaom/src/aom_dsp/x86/aom_subpixel_8t_intrin_avx2.c
diff --git a/third_party/aom/aom_dsp/x86/aom_subpixel_8t_intrin_ssse3.c b/media/libaom/src/aom_dsp/x86/aom_subpixel_8t_intrin_ssse3.c
similarity index 100%
rename from third_party/aom/aom_dsp/x86/aom_subpixel_8t_intrin_ssse3.c
rename to media/libaom/src/aom_dsp/x86/aom_subpixel_8t_intrin_ssse3.c
diff --git a/third_party/aom/aom_dsp/x86/aom_subpixel_8t_sse2.asm b/media/libaom/src/aom_dsp/x86/aom_subpixel_8t_sse2.asm
similarity index 100%
rename from third_party/aom/aom_dsp/x86/aom_subpixel_8t_sse2.asm
rename to media/libaom/src/aom_dsp/x86/aom_subpixel_8t_sse2.asm
diff --git a/third_party/aom/aom_dsp/x86/aom_subpixel_8t_ssse3.asm b/media/libaom/src/aom_dsp/x86/aom_subpixel_8t_ssse3.asm
similarity index 100%
rename from third_party/aom/aom_dsp/x86/aom_subpixel_8t_ssse3.asm
rename to media/libaom/src/aom_dsp/x86/aom_subpixel_8t_ssse3.asm
diff --git a/third_party/aom/aom_dsp/x86/aom_subpixel_bilinear_sse2.asm b/media/libaom/src/aom_dsp/x86/aom_subpixel_bilinear_sse2.asm
similarity index 100%
rename from third_party/aom/aom_dsp/x86/aom_subpixel_bilinear_sse2.asm
rename to media/libaom/src/aom_dsp/x86/aom_subpixel_bilinear_sse2.asm
diff --git a/third_party/aom/aom_dsp/x86/aom_subpixel_bilinear_ssse3.asm b/media/libaom/src/aom_dsp/x86/aom_subpixel_bilinear_ssse3.asm
similarity index 100%
rename from third_party/aom/aom_dsp/x86/aom_subpixel_bilinear_ssse3.asm
rename to media/libaom/src/aom_dsp/x86/aom_subpixel_bilinear_ssse3.asm
diff --git a/third_party/aom/aom_dsp/x86/blend_a64_hmask_sse4.c b/media/libaom/src/aom_dsp/x86/blend_a64_hmask_sse4.c
similarity index 100%
rename from third_party/aom/aom_dsp/x86/blend_a64_hmask_sse4.c
rename to media/libaom/src/aom_dsp/x86/blend_a64_hmask_sse4.c
diff --git a/third_party/aom/aom_dsp/x86/blend_a64_mask_avx2.c b/media/libaom/src/aom_dsp/x86/blend_a64_mask_avx2.c
similarity index 100%
rename from third_party/aom/aom_dsp/x86/blend_a64_mask_avx2.c
rename to media/libaom/src/aom_dsp/x86/blend_a64_mask_avx2.c
diff --git a/third_party/aom/aom_dsp/x86/blend_a64_mask_sse4.c b/media/libaom/src/aom_dsp/x86/blend_a64_mask_sse4.c
similarity index 100%
rename from third_party/aom/aom_dsp/x86/blend_a64_mask_sse4.c
rename to media/libaom/src/aom_dsp/x86/blend_a64_mask_sse4.c
diff --git a/third_party/aom/aom_dsp/x86/blend_a64_vmask_sse4.c b/media/libaom/src/aom_dsp/x86/blend_a64_vmask_sse4.c
similarity index 100%
rename from third_party/aom/aom_dsp/x86/blend_a64_vmask_sse4.c
rename to media/libaom/src/aom_dsp/x86/blend_a64_vmask_sse4.c
diff --git a/third_party/aom/aom_dsp/x86/blend_mask_sse4.h b/media/libaom/src/aom_dsp/x86/blend_mask_sse4.h
similarity index 100%
rename from third_party/aom/aom_dsp/x86/blend_mask_sse4.h
rename to media/libaom/src/aom_dsp/x86/blend_mask_sse4.h
diff --git a/third_party/aom/aom_dsp/x86/blend_sse4.h b/media/libaom/src/aom_dsp/x86/blend_sse4.h
similarity index 100%
rename from third_party/aom/aom_dsp/x86/blend_sse4.h
rename to media/libaom/src/aom_dsp/x86/blend_sse4.h
diff --git a/third_party/aom/aom_dsp/x86/common_avx2.h b/media/libaom/src/aom_dsp/x86/common_avx2.h
similarity index 100%
rename from third_party/aom/aom_dsp/x86/common_avx2.h
rename to media/libaom/src/aom_dsp/x86/common_avx2.h
diff --git a/third_party/aom/aom_dsp/x86/convolve.h b/media/libaom/src/aom_dsp/x86/convolve.h
similarity index 100%
rename from third_party/aom/aom_dsp/x86/convolve.h
rename to media/libaom/src/aom_dsp/x86/convolve.h
diff --git a/third_party/aom/aom_dsp/x86/convolve_avx2.h b/media/libaom/src/aom_dsp/x86/convolve_avx2.h
similarity index 100%
rename from third_party/aom/aom_dsp/x86/convolve_avx2.h
rename to media/libaom/src/aom_dsp/x86/convolve_avx2.h
diff --git a/third_party/aom/aom_dsp/x86/convolve_common_intrin.h b/media/libaom/src/aom_dsp/x86/convolve_common_intrin.h
similarity index 100%
rename from third_party/aom/aom_dsp/x86/convolve_common_intrin.h
rename to media/libaom/src/aom_dsp/x86/convolve_common_intrin.h
diff --git a/third_party/aom/aom_dsp/x86/convolve_sse2.h b/media/libaom/src/aom_dsp/x86/convolve_sse2.h
similarity index 100%
rename from third_party/aom/aom_dsp/x86/convolve_sse2.h
rename to media/libaom/src/aom_dsp/x86/convolve_sse2.h
diff --git a/third_party/aom/aom_dsp/x86/convolve_sse4_1.h b/media/libaom/src/aom_dsp/x86/convolve_sse4_1.h
similarity index 100%
rename from third_party/aom/aom_dsp/x86/convolve_sse4_1.h
rename to media/libaom/src/aom_dsp/x86/convolve_sse4_1.h
diff --git a/third_party/aom/aom_dsp/x86/fft_avx2.c b/media/libaom/src/aom_dsp/x86/fft_avx2.c
similarity index 100%
rename from third_party/aom/aom_dsp/x86/fft_avx2.c
rename to media/libaom/src/aom_dsp/x86/fft_avx2.c
diff --git a/third_party/aom/aom_dsp/x86/fft_sse2.c b/media/libaom/src/aom_dsp/x86/fft_sse2.c
similarity index 100%
rename from third_party/aom/aom_dsp/x86/fft_sse2.c
rename to media/libaom/src/aom_dsp/x86/fft_sse2.c
diff --git a/third_party/aom/aom_dsp/x86/fwd_txfm_impl_sse2.h b/media/libaom/src/aom_dsp/x86/fwd_txfm_impl_sse2.h
similarity index 100%
rename from third_party/aom/aom_dsp/x86/fwd_txfm_impl_sse2.h
rename to media/libaom/src/aom_dsp/x86/fwd_txfm_impl_sse2.h
diff --git a/third_party/aom/aom_dsp/x86/fwd_txfm_sse2.c b/media/libaom/src/aom_dsp/x86/fwd_txfm_sse2.c
similarity index 100%
rename from third_party/aom/aom_dsp/x86/fwd_txfm_sse2.c
rename to media/libaom/src/aom_dsp/x86/fwd_txfm_sse2.c
diff --git a/third_party/aom/aom_dsp/x86/fwd_txfm_sse2.h b/media/libaom/src/aom_dsp/x86/fwd_txfm_sse2.h
similarity index 100%
rename from third_party/aom/aom_dsp/x86/fwd_txfm_sse2.h
rename to media/libaom/src/aom_dsp/x86/fwd_txfm_sse2.h
diff --git a/third_party/aom/aom_dsp/x86/fwd_txfm_ssse3_x86_64.asm b/media/libaom/src/aom_dsp/x86/fwd_txfm_ssse3_x86_64.asm
similarity index 100%
rename from third_party/aom/aom_dsp/x86/fwd_txfm_ssse3_x86_64.asm
rename to media/libaom/src/aom_dsp/x86/fwd_txfm_ssse3_x86_64.asm
diff --git a/third_party/aom/aom_dsp/x86/highbd_convolve_avx2.c b/media/libaom/src/aom_dsp/x86/highbd_convolve_avx2.c
similarity index 100%
rename from third_party/aom/aom_dsp/x86/highbd_convolve_avx2.c
rename to media/libaom/src/aom_dsp/x86/highbd_convolve_avx2.c
diff --git a/third_party/aom/aom_dsp/x86/highbd_convolve_ssse3.c b/media/libaom/src/aom_dsp/x86/highbd_convolve_ssse3.c
similarity index 100%
rename from third_party/aom/aom_dsp/x86/highbd_convolve_ssse3.c
rename to media/libaom/src/aom_dsp/x86/highbd_convolve_ssse3.c
diff --git a/third_party/aom/aom_dsp/x86/highbd_intrapred_sse2.c b/media/libaom/src/aom_dsp/x86/highbd_intrapred_sse2.c
similarity index 100%
rename from third_party/aom/aom_dsp/x86/highbd_intrapred_sse2.c
rename to media/libaom/src/aom_dsp/x86/highbd_intrapred_sse2.c
diff --git a/third_party/aom/aom_dsp/x86/highbd_intrapred_sse2_asm.asm b/media/libaom/src/aom_dsp/x86/highbd_intrapred_sse2_asm.asm
similarity index 100%
rename from third_party/aom/aom_dsp/x86/highbd_intrapred_sse2_asm.asm
rename to media/libaom/src/aom_dsp/x86/highbd_intrapred_sse2_asm.asm
diff --git a/third_party/aom/aom_dsp/x86/highbd_loopfilter_avx2.c b/media/libaom/src/aom_dsp/x86/highbd_loopfilter_avx2.c
similarity index 100%
rename from third_party/aom/aom_dsp/x86/highbd_loopfilter_avx2.c
rename to media/libaom/src/aom_dsp/x86/highbd_loopfilter_avx2.c
diff --git a/third_party/aom/aom_dsp/x86/highbd_loopfilter_sse2.c b/media/libaom/src/aom_dsp/x86/highbd_loopfilter_sse2.c
similarity index 100%
rename from third_party/aom/aom_dsp/x86/highbd_loopfilter_sse2.c
rename to media/libaom/src/aom_dsp/x86/highbd_loopfilter_sse2.c
diff --git a/third_party/aom/aom_dsp/x86/highbd_quantize_intrin_avx2.c b/media/libaom/src/aom_dsp/x86/highbd_quantize_intrin_avx2.c
similarity index 100%
rename from third_party/aom/aom_dsp/x86/highbd_quantize_intrin_avx2.c
rename to media/libaom/src/aom_dsp/x86/highbd_quantize_intrin_avx2.c
diff --git a/third_party/aom/aom_dsp/x86/highbd_quantize_intrin_sse2.c b/media/libaom/src/aom_dsp/x86/highbd_quantize_intrin_sse2.c
similarity index 100%
rename from third_party/aom/aom_dsp/x86/highbd_quantize_intrin_sse2.c
rename to media/libaom/src/aom_dsp/x86/highbd_quantize_intrin_sse2.c
diff --git a/third_party/aom/aom_dsp/x86/highbd_sad4d_sse2.asm b/media/libaom/src/aom_dsp/x86/highbd_sad4d_sse2.asm
similarity index 100%
rename from third_party/aom/aom_dsp/x86/highbd_sad4d_sse2.asm
rename to media/libaom/src/aom_dsp/x86/highbd_sad4d_sse2.asm
diff --git a/third_party/aom/aom_dsp/x86/highbd_sad_sse2.asm b/media/libaom/src/aom_dsp/x86/highbd_sad_sse2.asm
similarity index 100%
rename from third_party/aom/aom_dsp/x86/highbd_sad_sse2.asm
rename to media/libaom/src/aom_dsp/x86/highbd_sad_sse2.asm
diff --git a/third_party/aom/aom_dsp/x86/highbd_subpel_variance_impl_sse2.asm b/media/libaom/src/aom_dsp/x86/highbd_subpel_variance_impl_sse2.asm
similarity index 100%
rename from third_party/aom/aom_dsp/x86/highbd_subpel_variance_impl_sse2.asm
rename to media/libaom/src/aom_dsp/x86/highbd_subpel_variance_impl_sse2.asm
diff --git a/third_party/aom/aom_dsp/x86/highbd_subtract_sse2.c b/media/libaom/src/aom_dsp/x86/highbd_subtract_sse2.c
similarity index 100%
rename from third_party/aom/aom_dsp/x86/highbd_subtract_sse2.c
rename to media/libaom/src/aom_dsp/x86/highbd_subtract_sse2.c
diff --git a/third_party/aom/aom_dsp/x86/highbd_variance_avx2.c b/media/libaom/src/aom_dsp/x86/highbd_variance_avx2.c
similarity index 100%
rename from third_party/aom/aom_dsp/x86/highbd_variance_avx2.c
rename to media/libaom/src/aom_dsp/x86/highbd_variance_avx2.c
diff --git a/third_party/aom/aom_dsp/x86/highbd_variance_impl_sse2.asm b/media/libaom/src/aom_dsp/x86/highbd_variance_impl_sse2.asm
similarity index 100%
rename from third_party/aom/aom_dsp/x86/highbd_variance_impl_sse2.asm
rename to media/libaom/src/aom_dsp/x86/highbd_variance_impl_sse2.asm
diff --git a/third_party/aom/aom_dsp/x86/highbd_variance_sse2.c b/media/libaom/src/aom_dsp/x86/highbd_variance_sse2.c
similarity index 100%
rename from third_party/aom/aom_dsp/x86/highbd_variance_sse2.c
rename to media/libaom/src/aom_dsp/x86/highbd_variance_sse2.c
diff --git a/third_party/aom/aom_dsp/x86/highbd_variance_sse4.c b/media/libaom/src/aom_dsp/x86/highbd_variance_sse4.c
similarity index 100%
rename from third_party/aom/aom_dsp/x86/highbd_variance_sse4.c
rename to media/libaom/src/aom_dsp/x86/highbd_variance_sse4.c
diff --git a/third_party/aom/aom_dsp/x86/intrapred_avx2.c b/media/libaom/src/aom_dsp/x86/intrapred_avx2.c
similarity index 100%
rename from third_party/aom/aom_dsp/x86/intrapred_avx2.c
rename to media/libaom/src/aom_dsp/x86/intrapred_avx2.c
diff --git a/third_party/aom/aom_dsp/x86/intrapred_sse2.c b/media/libaom/src/aom_dsp/x86/intrapred_sse2.c
similarity index 100%
rename from third_party/aom/aom_dsp/x86/intrapred_sse2.c
rename to media/libaom/src/aom_dsp/x86/intrapred_sse2.c
diff --git a/third_party/aom/aom_dsp/x86/intrapred_sse2_asm.asm b/media/libaom/src/aom_dsp/x86/intrapred_sse2_asm.asm
similarity index 100%
rename from third_party/aom/aom_dsp/x86/intrapred_sse2_asm.asm
rename to media/libaom/src/aom_dsp/x86/intrapred_sse2_asm.asm
diff --git a/third_party/aom/aom_dsp/x86/intrapred_ssse3.c b/media/libaom/src/aom_dsp/x86/intrapred_ssse3.c
similarity index 100%
rename from third_party/aom/aom_dsp/x86/intrapred_ssse3.c
rename to media/libaom/src/aom_dsp/x86/intrapred_ssse3.c
diff --git a/third_party/aom/aom_dsp/x86/inv_wht_sse2.asm b/media/libaom/src/aom_dsp/x86/inv_wht_sse2.asm
similarity index 100%
rename from third_party/aom/aom_dsp/x86/inv_wht_sse2.asm
rename to media/libaom/src/aom_dsp/x86/inv_wht_sse2.asm
diff --git a/third_party/aom/aom_dsp/x86/jnt_sad_ssse3.c b/media/libaom/src/aom_dsp/x86/jnt_sad_ssse3.c
similarity index 100%
rename from third_party/aom/aom_dsp/x86/jnt_sad_ssse3.c
rename to media/libaom/src/aom_dsp/x86/jnt_sad_ssse3.c
diff --git a/third_party/aom/aom_dsp/x86/jnt_variance_ssse3.c b/media/libaom/src/aom_dsp/x86/jnt_variance_ssse3.c
similarity index 100%
rename from third_party/aom/aom_dsp/x86/jnt_variance_ssse3.c
rename to media/libaom/src/aom_dsp/x86/jnt_variance_ssse3.c
diff --git a/third_party/aom/aom_dsp/x86/loopfilter_sse2.c b/media/libaom/src/aom_dsp/x86/loopfilter_sse2.c
similarity index 100%
rename from third_party/aom/aom_dsp/x86/loopfilter_sse2.c
rename to media/libaom/src/aom_dsp/x86/loopfilter_sse2.c
diff --git a/third_party/aom/aom_dsp/x86/lpf_common_sse2.h b/media/libaom/src/aom_dsp/x86/lpf_common_sse2.h
similarity index 100%
rename from third_party/aom/aom_dsp/x86/lpf_common_sse2.h
rename to media/libaom/src/aom_dsp/x86/lpf_common_sse2.h
diff --git a/third_party/aom/aom_dsp/x86/masked_sad_intrin_avx2.c b/media/libaom/src/aom_dsp/x86/masked_sad_intrin_avx2.c
similarity index 100%
rename from third_party/aom/aom_dsp/x86/masked_sad_intrin_avx2.c
rename to media/libaom/src/aom_dsp/x86/masked_sad_intrin_avx2.c
diff --git a/third_party/aom/aom_dsp/x86/masked_sad_intrin_ssse3.c b/media/libaom/src/aom_dsp/x86/masked_sad_intrin_ssse3.c
similarity index 100%
rename from third_party/aom/aom_dsp/x86/masked_sad_intrin_ssse3.c
rename to media/libaom/src/aom_dsp/x86/masked_sad_intrin_ssse3.c
diff --git a/third_party/aom/aom_dsp/x86/masked_sad_intrin_ssse3.h b/media/libaom/src/aom_dsp/x86/masked_sad_intrin_ssse3.h
similarity index 100%
rename from third_party/aom/aom_dsp/x86/masked_sad_intrin_ssse3.h
rename to media/libaom/src/aom_dsp/x86/masked_sad_intrin_ssse3.h
diff --git a/third_party/aom/aom_dsp/x86/masked_variance_intrin_ssse3.c b/media/libaom/src/aom_dsp/x86/masked_variance_intrin_ssse3.c
similarity index 100%
rename from third_party/aom/aom_dsp/x86/masked_variance_intrin_ssse3.c
rename to media/libaom/src/aom_dsp/x86/masked_variance_intrin_ssse3.c
diff --git a/third_party/aom/aom_dsp/x86/masked_variance_intrin_ssse3.h b/media/libaom/src/aom_dsp/x86/masked_variance_intrin_ssse3.h
similarity index 100%
rename from third_party/aom/aom_dsp/x86/masked_variance_intrin_ssse3.h
rename to media/libaom/src/aom_dsp/x86/masked_variance_intrin_ssse3.h
diff --git a/third_party/aom/aom_dsp/x86/mem_sse2.h b/media/libaom/src/aom_dsp/x86/mem_sse2.h
similarity index 100%
rename from third_party/aom/aom_dsp/x86/mem_sse2.h
rename to media/libaom/src/aom_dsp/x86/mem_sse2.h
diff --git a/third_party/aom/aom_dsp/x86/obmc_intrinsic_sse4.h b/media/libaom/src/aom_dsp/x86/obmc_intrinsic_sse4.h
similarity index 100%
rename from third_party/aom/aom_dsp/x86/obmc_intrinsic_sse4.h
rename to media/libaom/src/aom_dsp/x86/obmc_intrinsic_sse4.h
diff --git a/third_party/aom/aom_dsp/x86/obmc_intrinsic_ssse3.h b/media/libaom/src/aom_dsp/x86/obmc_intrinsic_ssse3.h
similarity index 100%
rename from third_party/aom/aom_dsp/x86/obmc_intrinsic_ssse3.h
rename to media/libaom/src/aom_dsp/x86/obmc_intrinsic_ssse3.h
diff --git a/third_party/aom/aom_dsp/x86/obmc_sad_avx2.c b/media/libaom/src/aom_dsp/x86/obmc_sad_avx2.c
similarity index 100%
rename from third_party/aom/aom_dsp/x86/obmc_sad_avx2.c
rename to media/libaom/src/aom_dsp/x86/obmc_sad_avx2.c
diff --git a/third_party/aom/aom_dsp/x86/obmc_sad_sse4.c b/media/libaom/src/aom_dsp/x86/obmc_sad_sse4.c
similarity index 100%
rename from third_party/aom/aom_dsp/x86/obmc_sad_sse4.c
rename to media/libaom/src/aom_dsp/x86/obmc_sad_sse4.c
diff --git a/third_party/aom/aom_dsp/x86/obmc_variance_avx2.c b/media/libaom/src/aom_dsp/x86/obmc_variance_avx2.c
similarity index 100%
rename from third_party/aom/aom_dsp/x86/obmc_variance_avx2.c
rename to media/libaom/src/aom_dsp/x86/obmc_variance_avx2.c
diff --git a/third_party/aom/aom_dsp/x86/obmc_variance_sse4.c b/media/libaom/src/aom_dsp/x86/obmc_variance_sse4.c
similarity index 100%
rename from third_party/aom/aom_dsp/x86/obmc_variance_sse4.c
rename to media/libaom/src/aom_dsp/x86/obmc_variance_sse4.c
diff --git a/third_party/aom/aom_dsp/x86/quantize_avx_x86_64.asm b/media/libaom/src/aom_dsp/x86/quantize_avx_x86_64.asm
similarity index 100%
rename from third_party/aom/aom_dsp/x86/quantize_avx_x86_64.asm
rename to media/libaom/src/aom_dsp/x86/quantize_avx_x86_64.asm
diff --git a/third_party/aom/aom_dsp/x86/quantize_sse2.c b/media/libaom/src/aom_dsp/x86/quantize_sse2.c
similarity index 100%
rename from third_party/aom/aom_dsp/x86/quantize_sse2.c
rename to media/libaom/src/aom_dsp/x86/quantize_sse2.c
diff --git a/third_party/aom/aom_dsp/x86/quantize_ssse3_x86_64.asm b/media/libaom/src/aom_dsp/x86/quantize_ssse3_x86_64.asm
similarity index 100%
rename from third_party/aom/aom_dsp/x86/quantize_ssse3_x86_64.asm
rename to media/libaom/src/aom_dsp/x86/quantize_ssse3_x86_64.asm
diff --git a/third_party/aom/aom_dsp/x86/quantize_x86.h b/media/libaom/src/aom_dsp/x86/quantize_x86.h
similarity index 100%
rename from third_party/aom/aom_dsp/x86/quantize_x86.h
rename to media/libaom/src/aom_dsp/x86/quantize_x86.h
diff --git a/third_party/aom/aom_dsp/x86/sad4d_avx2.c b/media/libaom/src/aom_dsp/x86/sad4d_avx2.c
similarity index 100%
rename from third_party/aom/aom_dsp/x86/sad4d_avx2.c
rename to media/libaom/src/aom_dsp/x86/sad4d_avx2.c
diff --git a/third_party/aom/aom_dsp/x86/sad4d_sse2.asm b/media/libaom/src/aom_dsp/x86/sad4d_sse2.asm
similarity index 100%
rename from third_party/aom/aom_dsp/x86/sad4d_sse2.asm
rename to media/libaom/src/aom_dsp/x86/sad4d_sse2.asm
diff --git a/third_party/aom/aom_dsp/x86/sad_avx2.c b/media/libaom/src/aom_dsp/x86/sad_avx2.c
similarity index 100%
rename from third_party/aom/aom_dsp/x86/sad_avx2.c
rename to media/libaom/src/aom_dsp/x86/sad_avx2.c
diff --git a/third_party/aom/aom_dsp/x86/sad_highbd_avx2.c b/media/libaom/src/aom_dsp/x86/sad_highbd_avx2.c
similarity index 100%
rename from third_party/aom/aom_dsp/x86/sad_highbd_avx2.c
rename to media/libaom/src/aom_dsp/x86/sad_highbd_avx2.c
diff --git a/third_party/aom/aom_dsp/x86/sad_impl_avx2.c b/media/libaom/src/aom_dsp/x86/sad_impl_avx2.c
similarity index 100%
rename from third_party/aom/aom_dsp/x86/sad_impl_avx2.c
rename to media/libaom/src/aom_dsp/x86/sad_impl_avx2.c
diff --git a/third_party/aom/aom_dsp/x86/sad_sse2.asm b/media/libaom/src/aom_dsp/x86/sad_sse2.asm
similarity index 100%
rename from third_party/aom/aom_dsp/x86/sad_sse2.asm
rename to media/libaom/src/aom_dsp/x86/sad_sse2.asm
diff --git a/third_party/aom/aom_dsp/x86/sse_avx2.c b/media/libaom/src/aom_dsp/x86/sse_avx2.c
similarity index 100%
rename from third_party/aom/aom_dsp/x86/sse_avx2.c
rename to media/libaom/src/aom_dsp/x86/sse_avx2.c
diff --git a/third_party/aom/aom_dsp/x86/sse_sse4.c b/media/libaom/src/aom_dsp/x86/sse_sse4.c
similarity index 100%
rename from third_party/aom/aom_dsp/x86/sse_sse4.c
rename to media/libaom/src/aom_dsp/x86/sse_sse4.c
diff --git a/third_party/aom/aom_dsp/x86/ssim_opt_x86_64.asm b/media/libaom/src/aom_dsp/x86/ssim_opt_x86_64.asm
similarity index 100%
rename from third_party/aom/aom_dsp/x86/ssim_opt_x86_64.asm
rename to media/libaom/src/aom_dsp/x86/ssim_opt_x86_64.asm
diff --git a/third_party/aom/aom_dsp/x86/subpel_variance_sse2.asm b/media/libaom/src/aom_dsp/x86/subpel_variance_sse2.asm
similarity index 100%
rename from third_party/aom/aom_dsp/x86/subpel_variance_sse2.asm
rename to media/libaom/src/aom_dsp/x86/subpel_variance_sse2.asm
diff --git a/third_party/aom/aom_dsp/x86/subtract_avx2.c b/media/libaom/src/aom_dsp/x86/subtract_avx2.c
similarity index 100%
rename from third_party/aom/aom_dsp/x86/subtract_avx2.c
rename to media/libaom/src/aom_dsp/x86/subtract_avx2.c
diff --git a/third_party/aom/aom_dsp/x86/subtract_sse2.asm b/media/libaom/src/aom_dsp/x86/subtract_sse2.asm
similarity index 100%
rename from third_party/aom/aom_dsp/x86/subtract_sse2.asm
rename to media/libaom/src/aom_dsp/x86/subtract_sse2.asm
diff --git a/third_party/aom/aom_dsp/x86/sum_squares_avx2.c b/media/libaom/src/aom_dsp/x86/sum_squares_avx2.c
similarity index 100%
rename from third_party/aom/aom_dsp/x86/sum_squares_avx2.c
rename to media/libaom/src/aom_dsp/x86/sum_squares_avx2.c
diff --git a/third_party/aom/aom_dsp/x86/sum_squares_sse2.c b/media/libaom/src/aom_dsp/x86/sum_squares_sse2.c
similarity index 100%
rename from third_party/aom/aom_dsp/x86/sum_squares_sse2.c
rename to media/libaom/src/aom_dsp/x86/sum_squares_sse2.c
diff --git a/third_party/aom/aom_dsp/x86/sum_squares_sse2.h b/media/libaom/src/aom_dsp/x86/sum_squares_sse2.h
similarity index 100%
rename from third_party/aom/aom_dsp/x86/sum_squares_sse2.h
rename to media/libaom/src/aom_dsp/x86/sum_squares_sse2.h
diff --git a/third_party/aom/aom_dsp/x86/synonyms.h b/media/libaom/src/aom_dsp/x86/synonyms.h
similarity index 100%
rename from third_party/aom/aom_dsp/x86/synonyms.h
rename to media/libaom/src/aom_dsp/x86/synonyms.h
diff --git a/third_party/aom/aom_dsp/x86/synonyms_avx2.h b/media/libaom/src/aom_dsp/x86/synonyms_avx2.h
similarity index 100%
rename from third_party/aom/aom_dsp/x86/synonyms_avx2.h
rename to media/libaom/src/aom_dsp/x86/synonyms_avx2.h
diff --git a/third_party/aom/aom_dsp/x86/transpose_sse2.h b/media/libaom/src/aom_dsp/x86/transpose_sse2.h
similarity index 100%
rename from third_party/aom/aom_dsp/x86/transpose_sse2.h
rename to media/libaom/src/aom_dsp/x86/transpose_sse2.h
diff --git a/third_party/aom/aom_dsp/x86/txfm_common_avx2.h b/media/libaom/src/aom_dsp/x86/txfm_common_avx2.h
similarity index 100%
rename from third_party/aom/aom_dsp/x86/txfm_common_avx2.h
rename to media/libaom/src/aom_dsp/x86/txfm_common_avx2.h
diff --git a/third_party/aom/aom_dsp/x86/txfm_common_sse2.h b/media/libaom/src/aom_dsp/x86/txfm_common_sse2.h
similarity index 100%
rename from third_party/aom/aom_dsp/x86/txfm_common_sse2.h
rename to media/libaom/src/aom_dsp/x86/txfm_common_sse2.h
diff --git a/third_party/aom/aom_dsp/x86/variance_avx2.c b/media/libaom/src/aom_dsp/x86/variance_avx2.c
similarity index 100%
rename from third_party/aom/aom_dsp/x86/variance_avx2.c
rename to media/libaom/src/aom_dsp/x86/variance_avx2.c
diff --git a/third_party/aom/aom_dsp/x86/variance_impl_avx2.c b/media/libaom/src/aom_dsp/x86/variance_impl_avx2.c
similarity index 100%
rename from third_party/aom/aom_dsp/x86/variance_impl_avx2.c
rename to media/libaom/src/aom_dsp/x86/variance_impl_avx2.c
diff --git a/third_party/aom/aom_dsp/x86/variance_impl_ssse3.c b/media/libaom/src/aom_dsp/x86/variance_impl_ssse3.c
similarity index 100%
rename from third_party/aom/aom_dsp/x86/variance_impl_ssse3.c
rename to media/libaom/src/aom_dsp/x86/variance_impl_ssse3.c
diff --git a/third_party/aom/aom_dsp/x86/variance_sse2.c b/media/libaom/src/aom_dsp/x86/variance_sse2.c
similarity index 100%
rename from third_party/aom/aom_dsp/x86/variance_sse2.c
rename to media/libaom/src/aom_dsp/x86/variance_sse2.c
diff --git a/third_party/aom/aom_mem/aom_mem.c b/media/libaom/src/aom_mem/aom_mem.c
similarity index 100%
rename from third_party/aom/aom_mem/aom_mem.c
rename to media/libaom/src/aom_mem/aom_mem.c
diff --git a/third_party/aom/aom_mem/aom_mem.cmake b/media/libaom/src/aom_mem/aom_mem.cmake
similarity index 100%
rename from third_party/aom/aom_mem/aom_mem.cmake
rename to media/libaom/src/aom_mem/aom_mem.cmake
diff --git a/third_party/aom/aom_mem/aom_mem.h b/media/libaom/src/aom_mem/aom_mem.h
similarity index 100%
rename from third_party/aom/aom_mem/aom_mem.h
rename to media/libaom/src/aom_mem/aom_mem.h
diff --git a/third_party/aom/aom_mem/include/aom_mem_intrnl.h b/media/libaom/src/aom_mem/include/aom_mem_intrnl.h
similarity index 100%
rename from third_party/aom/aom_mem/include/aom_mem_intrnl.h
rename to media/libaom/src/aom_mem/include/aom_mem_intrnl.h
diff --git a/third_party/aom/aom_ports/aom_once.h b/media/libaom/src/aom_ports/aom_once.h
similarity index 100%
rename from third_party/aom/aom_ports/aom_once.h
rename to media/libaom/src/aom_ports/aom_once.h
diff --git a/third_party/aom/aom_ports/aom_ports.cmake b/media/libaom/src/aom_ports/aom_ports.cmake
similarity index 100%
rename from third_party/aom/aom_ports/aom_ports.cmake
rename to media/libaom/src/aom_ports/aom_ports.cmake
diff --git a/third_party/aom/aom_ports/aom_timer.h b/media/libaom/src/aom_ports/aom_timer.h
similarity index 100%
rename from third_party/aom/aom_ports/aom_timer.h
rename to media/libaom/src/aom_ports/aom_timer.h
diff --git a/third_party/aom/aom_ports/arm.h b/media/libaom/src/aom_ports/arm.h
similarity index 100%
rename from third_party/aom/aom_ports/arm.h
rename to media/libaom/src/aom_ports/arm.h
diff --git a/third_party/aom/aom_ports/arm_cpudetect.c b/media/libaom/src/aom_ports/arm_cpudetect.c
similarity index 100%
rename from third_party/aom/aom_ports/arm_cpudetect.c
rename to media/libaom/src/aom_ports/arm_cpudetect.c
diff --git a/third_party/aom/aom_ports/bitops.h b/media/libaom/src/aom_ports/bitops.h
similarity index 100%
rename from third_party/aom/aom_ports/bitops.h
rename to media/libaom/src/aom_ports/bitops.h
diff --git a/third_party/aom/aom_ports/emmintrin_compat.h b/media/libaom/src/aom_ports/emmintrin_compat.h
similarity index 100%
rename from third_party/aom/aom_ports/emmintrin_compat.h
rename to media/libaom/src/aom_ports/emmintrin_compat.h
diff --git a/third_party/aom/aom_ports/emms.asm b/media/libaom/src/aom_ports/emms.asm
similarity index 100%
rename from third_party/aom/aom_ports/emms.asm
rename to media/libaom/src/aom_ports/emms.asm
diff --git a/third_party/aom/aom_ports/mem.h b/media/libaom/src/aom_ports/mem.h
similarity index 100%
rename from third_party/aom/aom_ports/mem.h
rename to media/libaom/src/aom_ports/mem.h
diff --git a/third_party/aom/aom_ports/mem_ops.h b/media/libaom/src/aom_ports/mem_ops.h
similarity index 100%
rename from third_party/aom/aom_ports/mem_ops.h
rename to media/libaom/src/aom_ports/mem_ops.h
diff --git a/third_party/aom/aom_ports/mem_ops_aligned.h b/media/libaom/src/aom_ports/mem_ops_aligned.h
similarity index 100%
rename from third_party/aom/aom_ports/mem_ops_aligned.h
rename to media/libaom/src/aom_ports/mem_ops_aligned.h
diff --git a/third_party/aom/aom_ports/msvc.h b/media/libaom/src/aom_ports/msvc.h
similarity index 100%
rename from third_party/aom/aom_ports/msvc.h
rename to media/libaom/src/aom_ports/msvc.h
diff --git a/third_party/aom/aom_ports/ppc.h b/media/libaom/src/aom_ports/ppc.h
similarity index 100%
rename from third_party/aom/aom_ports/ppc.h
rename to media/libaom/src/aom_ports/ppc.h
diff --git a/third_party/aom/aom_ports/ppc_cpudetect.c b/media/libaom/src/aom_ports/ppc_cpudetect.c
similarity index 100%
rename from third_party/aom/aom_ports/ppc_cpudetect.c
rename to media/libaom/src/aom_ports/ppc_cpudetect.c
diff --git a/third_party/aom/aom_ports/sanitizer.h b/media/libaom/src/aom_ports/sanitizer.h
similarity index 100%
rename from third_party/aom/aom_ports/sanitizer.h
rename to media/libaom/src/aom_ports/sanitizer.h
diff --git a/third_party/aom/aom_ports/system_state.h b/media/libaom/src/aom_ports/system_state.h
similarity index 100%
rename from third_party/aom/aom_ports/system_state.h
rename to media/libaom/src/aom_ports/system_state.h
diff --git a/third_party/aom/aom_ports/x86.h b/media/libaom/src/aom_ports/x86.h
similarity index 100%
rename from third_party/aom/aom_ports/x86.h
rename to media/libaom/src/aom_ports/x86.h
diff --git a/third_party/aom/aom_ports/x86_abi_support.asm b/media/libaom/src/aom_ports/x86_abi_support.asm
similarity index 100%
rename from third_party/aom/aom_ports/x86_abi_support.asm
rename to media/libaom/src/aom_ports/x86_abi_support.asm
diff --git a/third_party/aom/aom_scale/aom_scale.cmake b/media/libaom/src/aom_scale/aom_scale.cmake
similarity index 100%
rename from third_party/aom/aom_scale/aom_scale.cmake
rename to media/libaom/src/aom_scale/aom_scale.cmake
diff --git a/third_party/aom/aom_scale/aom_scale.h b/media/libaom/src/aom_scale/aom_scale.h
similarity index 100%
rename from third_party/aom/aom_scale/aom_scale.h
rename to media/libaom/src/aom_scale/aom_scale.h
diff --git a/third_party/aom/aom_scale/aom_scale_rtcd.c b/media/libaom/src/aom_scale/aom_scale_rtcd.c
similarity index 100%
rename from third_party/aom/aom_scale/aom_scale_rtcd.c
rename to media/libaom/src/aom_scale/aom_scale_rtcd.c
diff --git a/third_party/aom/aom_scale/aom_scale_rtcd.pl b/media/libaom/src/aom_scale/aom_scale_rtcd.pl
similarity index 100%
rename from third_party/aom/aom_scale/aom_scale_rtcd.pl
rename to media/libaom/src/aom_scale/aom_scale_rtcd.pl
diff --git a/third_party/aom/aom_scale/generic/aom_scale.c b/media/libaom/src/aom_scale/generic/aom_scale.c
similarity index 100%
rename from third_party/aom/aom_scale/generic/aom_scale.c
rename to media/libaom/src/aom_scale/generic/aom_scale.c
diff --git a/third_party/aom/aom_scale/generic/gen_scalers.c b/media/libaom/src/aom_scale/generic/gen_scalers.c
similarity index 100%
rename from third_party/aom/aom_scale/generic/gen_scalers.c
rename to media/libaom/src/aom_scale/generic/gen_scalers.c
diff --git a/third_party/aom/aom_scale/generic/yv12config.c b/media/libaom/src/aom_scale/generic/yv12config.c
similarity index 100%
rename from third_party/aom/aom_scale/generic/yv12config.c
rename to media/libaom/src/aom_scale/generic/yv12config.c
diff --git a/third_party/aom/aom_scale/generic/yv12extend.c b/media/libaom/src/aom_scale/generic/yv12extend.c
similarity index 100%
rename from third_party/aom/aom_scale/generic/yv12extend.c
rename to media/libaom/src/aom_scale/generic/yv12extend.c
diff --git a/third_party/aom/aom_scale/mips/dspr2/yv12extend_dspr2.c b/media/libaom/src/aom_scale/mips/dspr2/yv12extend_dspr2.c
similarity index 100%
rename from third_party/aom/aom_scale/mips/dspr2/yv12extend_dspr2.c
rename to media/libaom/src/aom_scale/mips/dspr2/yv12extend_dspr2.c
diff --git a/third_party/aom/aom_scale/yv12config.h b/media/libaom/src/aom_scale/yv12config.h
similarity index 100%
rename from third_party/aom/aom_scale/yv12config.h
rename to media/libaom/src/aom_scale/yv12config.h
diff --git a/third_party/aom/aom_util/aom_thread.c b/media/libaom/src/aom_util/aom_thread.c
similarity index 100%
rename from third_party/aom/aom_util/aom_thread.c
rename to media/libaom/src/aom_util/aom_thread.c
diff --git a/third_party/aom/aom_util/aom_thread.h b/media/libaom/src/aom_util/aom_thread.h
similarity index 100%
rename from third_party/aom/aom_util/aom_thread.h
rename to media/libaom/src/aom_util/aom_thread.h
diff --git a/third_party/aom/aom_util/aom_util.cmake b/media/libaom/src/aom_util/aom_util.cmake
similarity index 100%
rename from third_party/aom/aom_util/aom_util.cmake
rename to media/libaom/src/aom_util/aom_util.cmake
diff --git a/third_party/aom/aom_util/debug_util.c b/media/libaom/src/aom_util/debug_util.c
similarity index 100%
rename from third_party/aom/aom_util/debug_util.c
rename to media/libaom/src/aom_util/debug_util.c
diff --git a/third_party/aom/aom_util/debug_util.h b/media/libaom/src/aom_util/debug_util.h
similarity index 100%
rename from third_party/aom/aom_util/debug_util.h
rename to media/libaom/src/aom_util/debug_util.h
diff --git a/third_party/aom/aom_util/endian_inl.h b/media/libaom/src/aom_util/endian_inl.h
similarity index 100%
rename from third_party/aom/aom_util/endian_inl.h
rename to media/libaom/src/aom_util/endian_inl.h
diff --git a/third_party/aom/apps/aomdec.c b/media/libaom/src/apps/aomdec.c
similarity index 100%
rename from third_party/aom/apps/aomdec.c
rename to media/libaom/src/apps/aomdec.c
diff --git a/third_party/aom/apps/aomenc.c b/media/libaom/src/apps/aomenc.c
similarity index 100%
rename from third_party/aom/apps/aomenc.c
rename to media/libaom/src/apps/aomenc.c
diff --git a/third_party/aom/apps/aomenc.h b/media/libaom/src/apps/aomenc.h
similarity index 100%
rename from third_party/aom/apps/aomenc.h
rename to media/libaom/src/apps/aomenc.h
diff --git a/third_party/aom/av1/av1.cmake b/media/libaom/src/av1/av1.cmake
similarity index 100%
rename from third_party/aom/av1/av1.cmake
rename to media/libaom/src/av1/av1.cmake
diff --git a/third_party/aom/av1/av1_cx_iface.c b/media/libaom/src/av1/av1_cx_iface.c
similarity index 100%
rename from third_party/aom/av1/av1_cx_iface.c
rename to media/libaom/src/av1/av1_cx_iface.c
diff --git a/third_party/aom/av1/av1_dx_iface.c b/media/libaom/src/av1/av1_dx_iface.c
similarity index 100%
rename from third_party/aom/av1/av1_dx_iface.c
rename to media/libaom/src/av1/av1_dx_iface.c
diff --git a/third_party/aom/av1/av1_iface_common.h b/media/libaom/src/av1/av1_iface_common.h
similarity index 100%
rename from third_party/aom/av1/av1_iface_common.h
rename to media/libaom/src/av1/av1_iface_common.h
diff --git a/third_party/aom/av1/common/alloccommon.c b/media/libaom/src/av1/common/alloccommon.c
similarity index 100%
rename from third_party/aom/av1/common/alloccommon.c
rename to media/libaom/src/av1/common/alloccommon.c
diff --git a/third_party/aom/av1/common/alloccommon.h b/media/libaom/src/av1/common/alloccommon.h
similarity index 100%
rename from third_party/aom/av1/common/alloccommon.h
rename to media/libaom/src/av1/common/alloccommon.h
diff --git a/third_party/aom/av1/common/arm/av1_inv_txfm_neon.c b/media/libaom/src/av1/common/arm/av1_inv_txfm_neon.c
similarity index 100%
rename from third_party/aom/av1/common/arm/av1_inv_txfm_neon.c
rename to media/libaom/src/av1/common/arm/av1_inv_txfm_neon.c
diff --git a/third_party/aom/av1/common/arm/av1_inv_txfm_neon.h b/media/libaom/src/av1/common/arm/av1_inv_txfm_neon.h
similarity index 100%
rename from third_party/aom/av1/common/arm/av1_inv_txfm_neon.h
rename to media/libaom/src/av1/common/arm/av1_inv_txfm_neon.h
diff --git a/third_party/aom/av1/common/arm/av1_txfm_neon.c b/media/libaom/src/av1/common/arm/av1_txfm_neon.c
similarity index 100%
rename from third_party/aom/av1/common/arm/av1_txfm_neon.c
rename to media/libaom/src/av1/common/arm/av1_txfm_neon.c
diff --git a/third_party/aom/av1/common/arm/blend_a64_hmask_neon.c b/media/libaom/src/av1/common/arm/blend_a64_hmask_neon.c
similarity index 100%
rename from third_party/aom/av1/common/arm/blend_a64_hmask_neon.c
rename to media/libaom/src/av1/common/arm/blend_a64_hmask_neon.c
diff --git a/third_party/aom/av1/common/arm/blend_a64_vmask_neon.c b/media/libaom/src/av1/common/arm/blend_a64_vmask_neon.c
similarity index 100%
rename from third_party/aom/av1/common/arm/blend_a64_vmask_neon.c
rename to media/libaom/src/av1/common/arm/blend_a64_vmask_neon.c
diff --git a/third_party/aom/av1/common/arm/cfl_neon.c b/media/libaom/src/av1/common/arm/cfl_neon.c
similarity index 100%
rename from third_party/aom/av1/common/arm/cfl_neon.c
rename to media/libaom/src/av1/common/arm/cfl_neon.c
diff --git a/third_party/aom/av1/common/arm/convolve_neon.c b/media/libaom/src/av1/common/arm/convolve_neon.c
similarity index 100%
rename from third_party/aom/av1/common/arm/convolve_neon.c
rename to media/libaom/src/av1/common/arm/convolve_neon.c
diff --git a/third_party/aom/av1/common/arm/convolve_neon.h b/media/libaom/src/av1/common/arm/convolve_neon.h
similarity index 100%
rename from third_party/aom/av1/common/arm/convolve_neon.h
rename to media/libaom/src/av1/common/arm/convolve_neon.h
diff --git a/third_party/aom/av1/common/arm/jnt_convolve_neon.c b/media/libaom/src/av1/common/arm/jnt_convolve_neon.c
similarity index 100%
rename from third_party/aom/av1/common/arm/jnt_convolve_neon.c
rename to media/libaom/src/av1/common/arm/jnt_convolve_neon.c
diff --git a/third_party/aom/av1/common/arm/mem_neon.h b/media/libaom/src/av1/common/arm/mem_neon.h
similarity index 100%
rename from third_party/aom/av1/common/arm/mem_neon.h
rename to media/libaom/src/av1/common/arm/mem_neon.h
diff --git a/third_party/aom/av1/common/arm/reconinter_neon.c b/media/libaom/src/av1/common/arm/reconinter_neon.c
similarity index 100%
rename from third_party/aom/av1/common/arm/reconinter_neon.c
rename to media/libaom/src/av1/common/arm/reconinter_neon.c
diff --git a/third_party/aom/av1/common/arm/selfguided_neon.c b/media/libaom/src/av1/common/arm/selfguided_neon.c
similarity index 100%
rename from third_party/aom/av1/common/arm/selfguided_neon.c
rename to media/libaom/src/av1/common/arm/selfguided_neon.c
diff --git a/third_party/aom/av1/common/arm/transpose_neon.h b/media/libaom/src/av1/common/arm/transpose_neon.h
similarity index 100%
rename from third_party/aom/av1/common/arm/transpose_neon.h
rename to media/libaom/src/av1/common/arm/transpose_neon.h
diff --git a/third_party/aom/av1/common/arm/warp_plane_neon.c b/media/libaom/src/av1/common/arm/warp_plane_neon.c
similarity index 100%
rename from third_party/aom/av1/common/arm/warp_plane_neon.c
rename to media/libaom/src/av1/common/arm/warp_plane_neon.c
diff --git a/third_party/aom/av1/common/arm/wiener_convolve_neon.c b/media/libaom/src/av1/common/arm/wiener_convolve_neon.c
similarity index 100%
rename from third_party/aom/av1/common/arm/wiener_convolve_neon.c
rename to media/libaom/src/av1/common/arm/wiener_convolve_neon.c
diff --git a/third_party/aom/av1/common/av1_inv_txfm1d.c b/media/libaom/src/av1/common/av1_inv_txfm1d.c
similarity index 100%
rename from third_party/aom/av1/common/av1_inv_txfm1d.c
rename to media/libaom/src/av1/common/av1_inv_txfm1d.c
diff --git a/third_party/aom/av1/common/av1_inv_txfm1d.h b/media/libaom/src/av1/common/av1_inv_txfm1d.h
similarity index 100%
rename from third_party/aom/av1/common/av1_inv_txfm1d.h
rename to media/libaom/src/av1/common/av1_inv_txfm1d.h
diff --git a/third_party/aom/av1/common/av1_inv_txfm1d_cfg.h b/media/libaom/src/av1/common/av1_inv_txfm1d_cfg.h
similarity index 100%
rename from third_party/aom/av1/common/av1_inv_txfm1d_cfg.h
rename to media/libaom/src/av1/common/av1_inv_txfm1d_cfg.h
diff --git a/third_party/aom/av1/common/av1_inv_txfm2d.c b/media/libaom/src/av1/common/av1_inv_txfm2d.c
similarity index 100%
rename from third_party/aom/av1/common/av1_inv_txfm2d.c
rename to media/libaom/src/av1/common/av1_inv_txfm2d.c
diff --git a/third_party/aom/av1/common/av1_loopfilter.c b/media/libaom/src/av1/common/av1_loopfilter.c
similarity index 100%
rename from third_party/aom/av1/common/av1_loopfilter.c
rename to media/libaom/src/av1/common/av1_loopfilter.c
diff --git a/third_party/aom/av1/common/av1_loopfilter.h b/media/libaom/src/av1/common/av1_loopfilter.h
similarity index 100%
rename from third_party/aom/av1/common/av1_loopfilter.h
rename to media/libaom/src/av1/common/av1_loopfilter.h
diff --git a/third_party/aom/av1/common/av1_rtcd.c b/media/libaom/src/av1/common/av1_rtcd.c
similarity index 100%
rename from third_party/aom/av1/common/av1_rtcd.c
rename to media/libaom/src/av1/common/av1_rtcd.c
diff --git a/third_party/aom/av1/common/av1_rtcd_defs.pl b/media/libaom/src/av1/common/av1_rtcd_defs.pl
similarity index 100%
rename from third_party/aom/av1/common/av1_rtcd_defs.pl
rename to media/libaom/src/av1/common/av1_rtcd_defs.pl
diff --git a/third_party/aom/av1/common/av1_txfm.c b/media/libaom/src/av1/common/av1_txfm.c
similarity index 100%
rename from third_party/aom/av1/common/av1_txfm.c
rename to media/libaom/src/av1/common/av1_txfm.c
diff --git a/third_party/aom/av1/common/av1_txfm.h b/media/libaom/src/av1/common/av1_txfm.h
similarity index 100%
rename from third_party/aom/av1/common/av1_txfm.h
rename to media/libaom/src/av1/common/av1_txfm.h
diff --git a/third_party/aom/av1/common/blockd.c b/media/libaom/src/av1/common/blockd.c
similarity index 100%
rename from third_party/aom/av1/common/blockd.c
rename to media/libaom/src/av1/common/blockd.c
diff --git a/third_party/aom/av1/common/blockd.h b/media/libaom/src/av1/common/blockd.h
similarity index 100%
rename from third_party/aom/av1/common/blockd.h
rename to media/libaom/src/av1/common/blockd.h
diff --git a/third_party/aom/av1/common/cdef.c b/media/libaom/src/av1/common/cdef.c
similarity index 100%
rename from third_party/aom/av1/common/cdef.c
rename to media/libaom/src/av1/common/cdef.c
diff --git a/third_party/aom/av1/common/cdef.h b/media/libaom/src/av1/common/cdef.h
similarity index 100%
rename from third_party/aom/av1/common/cdef.h
rename to media/libaom/src/av1/common/cdef.h
diff --git a/third_party/aom/av1/common/cdef_block.c b/media/libaom/src/av1/common/cdef_block.c
similarity index 100%
rename from third_party/aom/av1/common/cdef_block.c
rename to media/libaom/src/av1/common/cdef_block.c
diff --git a/third_party/aom/av1/common/cdef_block.h b/media/libaom/src/av1/common/cdef_block.h
similarity index 100%
rename from third_party/aom/av1/common/cdef_block.h
rename to media/libaom/src/av1/common/cdef_block.h
diff --git a/third_party/aom/av1/common/cdef_block_avx2.c b/media/libaom/src/av1/common/cdef_block_avx2.c
similarity index 100%
rename from third_party/aom/av1/common/cdef_block_avx2.c
rename to media/libaom/src/av1/common/cdef_block_avx2.c
diff --git a/third_party/aom/av1/common/cdef_block_neon.c b/media/libaom/src/av1/common/cdef_block_neon.c
similarity index 100%
rename from third_party/aom/av1/common/cdef_block_neon.c
rename to media/libaom/src/av1/common/cdef_block_neon.c
diff --git a/third_party/aom/av1/common/cdef_block_simd.h b/media/libaom/src/av1/common/cdef_block_simd.h
similarity index 100%
rename from third_party/aom/av1/common/cdef_block_simd.h
rename to media/libaom/src/av1/common/cdef_block_simd.h
diff --git a/third_party/aom/av1/common/cdef_block_sse2.c b/media/libaom/src/av1/common/cdef_block_sse2.c
similarity index 100%
rename from third_party/aom/av1/common/cdef_block_sse2.c
rename to media/libaom/src/av1/common/cdef_block_sse2.c
diff --git a/third_party/aom/av1/common/cdef_block_sse4.c b/media/libaom/src/av1/common/cdef_block_sse4.c
similarity index 100%
rename from third_party/aom/av1/common/cdef_block_sse4.c
rename to media/libaom/src/av1/common/cdef_block_sse4.c
diff --git a/third_party/aom/av1/common/cdef_block_ssse3.c b/media/libaom/src/av1/common/cdef_block_ssse3.c
similarity index 100%
rename from third_party/aom/av1/common/cdef_block_ssse3.c
rename to media/libaom/src/av1/common/cdef_block_ssse3.c
diff --git a/third_party/aom/av1/common/cfl.c b/media/libaom/src/av1/common/cfl.c
similarity index 100%
rename from third_party/aom/av1/common/cfl.c
rename to media/libaom/src/av1/common/cfl.c
diff --git a/third_party/aom/av1/common/cfl.h b/media/libaom/src/av1/common/cfl.h
similarity index 100%
rename from third_party/aom/av1/common/cfl.h
rename to media/libaom/src/av1/common/cfl.h
diff --git a/third_party/aom/av1/common/common.h b/media/libaom/src/av1/common/common.h
similarity index 100%
rename from third_party/aom/av1/common/common.h
rename to media/libaom/src/av1/common/common.h
diff --git a/third_party/aom/av1/common/common_data.h b/media/libaom/src/av1/common/common_data.h
similarity index 100%
rename from third_party/aom/av1/common/common_data.h
rename to media/libaom/src/av1/common/common_data.h
diff --git a/third_party/aom/av1/common/convolve.c b/media/libaom/src/av1/common/convolve.c
similarity index 100%
rename from third_party/aom/av1/common/convolve.c
rename to media/libaom/src/av1/common/convolve.c
diff --git a/third_party/aom/av1/common/convolve.h b/media/libaom/src/av1/common/convolve.h
similarity index 100%
rename from third_party/aom/av1/common/convolve.h
rename to media/libaom/src/av1/common/convolve.h
diff --git a/third_party/aom/av1/common/debugmodes.c b/media/libaom/src/av1/common/debugmodes.c
similarity index 100%
rename from third_party/aom/av1/common/debugmodes.c
rename to media/libaom/src/av1/common/debugmodes.c
diff --git a/third_party/aom/av1/common/entropy.c b/media/libaom/src/av1/common/entropy.c
similarity index 100%
rename from third_party/aom/av1/common/entropy.c
rename to media/libaom/src/av1/common/entropy.c
diff --git a/third_party/aom/av1/common/entropy.h b/media/libaom/src/av1/common/entropy.h
similarity index 100%
rename from third_party/aom/av1/common/entropy.h
rename to media/libaom/src/av1/common/entropy.h
diff --git a/third_party/aom/av1/common/entropymode.c b/media/libaom/src/av1/common/entropymode.c
similarity index 100%
rename from third_party/aom/av1/common/entropymode.c
rename to media/libaom/src/av1/common/entropymode.c
diff --git a/third_party/aom/av1/common/entropymode.h b/media/libaom/src/av1/common/entropymode.h
similarity index 100%
rename from third_party/aom/av1/common/entropymode.h
rename to media/libaom/src/av1/common/entropymode.h
diff --git a/third_party/aom/av1/common/entropymv.c b/media/libaom/src/av1/common/entropymv.c
similarity index 100%
rename from third_party/aom/av1/common/entropymv.c
rename to media/libaom/src/av1/common/entropymv.c
diff --git a/third_party/aom/av1/common/entropymv.h b/media/libaom/src/av1/common/entropymv.h
similarity index 100%
rename from third_party/aom/av1/common/entropymv.h
rename to media/libaom/src/av1/common/entropymv.h
diff --git a/third_party/aom/av1/common/enums.h b/media/libaom/src/av1/common/enums.h
similarity index 100%
rename from third_party/aom/av1/common/enums.h
rename to media/libaom/src/av1/common/enums.h
diff --git a/third_party/aom/av1/common/filter.h b/media/libaom/src/av1/common/filter.h
similarity index 100%
rename from third_party/aom/av1/common/filter.h
rename to media/libaom/src/av1/common/filter.h
diff --git a/third_party/aom/av1/common/frame_buffers.c b/media/libaom/src/av1/common/frame_buffers.c
similarity index 100%
rename from third_party/aom/av1/common/frame_buffers.c
rename to media/libaom/src/av1/common/frame_buffers.c
diff --git a/third_party/aom/av1/common/frame_buffers.h b/media/libaom/src/av1/common/frame_buffers.h
similarity index 100%
rename from third_party/aom/av1/common/frame_buffers.h
rename to media/libaom/src/av1/common/frame_buffers.h
diff --git a/third_party/aom/av1/common/idct.c b/media/libaom/src/av1/common/idct.c
similarity index 100%
rename from third_party/aom/av1/common/idct.c
rename to media/libaom/src/av1/common/idct.c
diff --git a/third_party/aom/av1/common/idct.h b/media/libaom/src/av1/common/idct.h
similarity index 100%
rename from third_party/aom/av1/common/idct.h
rename to media/libaom/src/av1/common/idct.h
diff --git a/third_party/aom/av1/common/mv.h b/media/libaom/src/av1/common/mv.h
similarity index 100%
rename from third_party/aom/av1/common/mv.h
rename to media/libaom/src/av1/common/mv.h
diff --git a/third_party/aom/av1/common/mvref_common.c b/media/libaom/src/av1/common/mvref_common.c
similarity index 100%
rename from third_party/aom/av1/common/mvref_common.c
rename to media/libaom/src/av1/common/mvref_common.c
diff --git a/third_party/aom/av1/common/mvref_common.h b/media/libaom/src/av1/common/mvref_common.h
similarity index 100%
rename from third_party/aom/av1/common/mvref_common.h
rename to media/libaom/src/av1/common/mvref_common.h
diff --git a/third_party/aom/av1/common/obmc.h b/media/libaom/src/av1/common/obmc.h
similarity index 100%
rename from third_party/aom/av1/common/obmc.h
rename to media/libaom/src/av1/common/obmc.h
diff --git a/third_party/aom/av1/common/obu_util.c b/media/libaom/src/av1/common/obu_util.c
similarity index 100%
rename from third_party/aom/av1/common/obu_util.c
rename to media/libaom/src/av1/common/obu_util.c
diff --git a/third_party/aom/av1/common/obu_util.h b/media/libaom/src/av1/common/obu_util.h
similarity index 100%
rename from third_party/aom/av1/common/obu_util.h
rename to media/libaom/src/av1/common/obu_util.h
diff --git a/third_party/aom/av1/common/odintrin.c b/media/libaom/src/av1/common/odintrin.c
similarity index 100%
rename from third_party/aom/av1/common/odintrin.c
rename to media/libaom/src/av1/common/odintrin.c
diff --git a/third_party/aom/av1/common/odintrin.h b/media/libaom/src/av1/common/odintrin.h
similarity index 100%
rename from third_party/aom/av1/common/odintrin.h
rename to media/libaom/src/av1/common/odintrin.h
diff --git a/third_party/aom/av1/common/onyxc_int.h b/media/libaom/src/av1/common/onyxc_int.h
similarity index 100%
rename from third_party/aom/av1/common/onyxc_int.h
rename to media/libaom/src/av1/common/onyxc_int.h
diff --git a/third_party/aom/av1/common/ppc/cfl_ppc.c b/media/libaom/src/av1/common/ppc/cfl_ppc.c
similarity index 100%
rename from third_party/aom/av1/common/ppc/cfl_ppc.c
rename to media/libaom/src/av1/common/ppc/cfl_ppc.c
diff --git a/third_party/aom/av1/common/pred_common.c b/media/libaom/src/av1/common/pred_common.c
similarity index 100%
rename from third_party/aom/av1/common/pred_common.c
rename to media/libaom/src/av1/common/pred_common.c
diff --git a/third_party/aom/av1/common/pred_common.h b/media/libaom/src/av1/common/pred_common.h
similarity index 100%
rename from third_party/aom/av1/common/pred_common.h
rename to media/libaom/src/av1/common/pred_common.h
diff --git a/third_party/aom/av1/common/quant_common.c b/media/libaom/src/av1/common/quant_common.c
similarity index 100%
rename from third_party/aom/av1/common/quant_common.c
rename to media/libaom/src/av1/common/quant_common.c
diff --git a/third_party/aom/av1/common/quant_common.h b/media/libaom/src/av1/common/quant_common.h
similarity index 100%
rename from third_party/aom/av1/common/quant_common.h
rename to media/libaom/src/av1/common/quant_common.h
diff --git a/third_party/aom/av1/common/reconinter.c b/media/libaom/src/av1/common/reconinter.c
similarity index 100%
rename from third_party/aom/av1/common/reconinter.c
rename to media/libaom/src/av1/common/reconinter.c
diff --git a/third_party/aom/av1/common/reconinter.h b/media/libaom/src/av1/common/reconinter.h
similarity index 100%
rename from third_party/aom/av1/common/reconinter.h
rename to media/libaom/src/av1/common/reconinter.h
diff --git a/third_party/aom/av1/common/reconintra.c b/media/libaom/src/av1/common/reconintra.c
similarity index 100%
rename from third_party/aom/av1/common/reconintra.c
rename to media/libaom/src/av1/common/reconintra.c
diff --git a/third_party/aom/av1/common/reconintra.h b/media/libaom/src/av1/common/reconintra.h
similarity index 100%
rename from third_party/aom/av1/common/reconintra.h
rename to media/libaom/src/av1/common/reconintra.h
diff --git a/third_party/aom/av1/common/resize.c b/media/libaom/src/av1/common/resize.c
similarity index 100%
rename from third_party/aom/av1/common/resize.c
rename to media/libaom/src/av1/common/resize.c
diff --git a/third_party/aom/av1/common/resize.h b/media/libaom/src/av1/common/resize.h
similarity index 100%
rename from third_party/aom/av1/common/resize.h
rename to media/libaom/src/av1/common/resize.h
diff --git a/third_party/aom/av1/common/restoration.c b/media/libaom/src/av1/common/restoration.c
similarity index 100%
rename from third_party/aom/av1/common/restoration.c
rename to media/libaom/src/av1/common/restoration.c
diff --git a/third_party/aom/av1/common/restoration.h b/media/libaom/src/av1/common/restoration.h
similarity index 100%
rename from third_party/aom/av1/common/restoration.h
rename to media/libaom/src/av1/common/restoration.h
diff --git a/third_party/aom/av1/common/scale.c b/media/libaom/src/av1/common/scale.c
similarity index 100%
rename from third_party/aom/av1/common/scale.c
rename to media/libaom/src/av1/common/scale.c
diff --git a/third_party/aom/av1/common/scale.h b/media/libaom/src/av1/common/scale.h
similarity index 100%
rename from third_party/aom/av1/common/scale.h
rename to media/libaom/src/av1/common/scale.h
diff --git a/third_party/aom/av1/common/scan.c b/media/libaom/src/av1/common/scan.c
similarity index 100%
rename from third_party/aom/av1/common/scan.c
rename to media/libaom/src/av1/common/scan.c
diff --git a/third_party/aom/av1/common/scan.h b/media/libaom/src/av1/common/scan.h
similarity index 100%
rename from third_party/aom/av1/common/scan.h
rename to media/libaom/src/av1/common/scan.h
diff --git a/third_party/aom/av1/common/seg_common.c b/media/libaom/src/av1/common/seg_common.c
similarity index 100%
rename from third_party/aom/av1/common/seg_common.c
rename to media/libaom/src/av1/common/seg_common.c
diff --git a/third_party/aom/av1/common/seg_common.h b/media/libaom/src/av1/common/seg_common.h
similarity index 100%
rename from third_party/aom/av1/common/seg_common.h
rename to media/libaom/src/av1/common/seg_common.h
diff --git a/third_party/aom/av1/common/thread_common.c b/media/libaom/src/av1/common/thread_common.c
similarity index 100%
rename from third_party/aom/av1/common/thread_common.c
rename to media/libaom/src/av1/common/thread_common.c
diff --git a/third_party/aom/av1/common/thread_common.h b/media/libaom/src/av1/common/thread_common.h
similarity index 100%
rename from third_party/aom/av1/common/thread_common.h
rename to media/libaom/src/av1/common/thread_common.h
diff --git a/third_party/aom/av1/common/tile_common.c b/media/libaom/src/av1/common/tile_common.c
similarity index 100%
rename from third_party/aom/av1/common/tile_common.c
rename to media/libaom/src/av1/common/tile_common.c
diff --git a/third_party/aom/av1/common/tile_common.h b/media/libaom/src/av1/common/tile_common.h
similarity index 100%
rename from third_party/aom/av1/common/tile_common.h
rename to media/libaom/src/av1/common/tile_common.h
diff --git a/third_party/aom/av1/common/timing.c b/media/libaom/src/av1/common/timing.c
similarity index 100%
rename from third_party/aom/av1/common/timing.c
rename to media/libaom/src/av1/common/timing.c
diff --git a/third_party/aom/av1/common/timing.h b/media/libaom/src/av1/common/timing.h
similarity index 100%
rename from third_party/aom/av1/common/timing.h
rename to media/libaom/src/av1/common/timing.h
diff --git a/third_party/aom/av1/common/token_cdfs.h b/media/libaom/src/av1/common/token_cdfs.h
similarity index 100%
rename from third_party/aom/av1/common/token_cdfs.h
rename to media/libaom/src/av1/common/token_cdfs.h
diff --git a/third_party/aom/av1/common/txb_common.c b/media/libaom/src/av1/common/txb_common.c
similarity index 100%
rename from third_party/aom/av1/common/txb_common.c
rename to media/libaom/src/av1/common/txb_common.c
diff --git a/third_party/aom/av1/common/txb_common.h b/media/libaom/src/av1/common/txb_common.h
similarity index 100%
rename from third_party/aom/av1/common/txb_common.h
rename to media/libaom/src/av1/common/txb_common.h
diff --git a/third_party/aom/av1/common/warped_motion.c b/media/libaom/src/av1/common/warped_motion.c
similarity index 100%
rename from third_party/aom/av1/common/warped_motion.c
rename to media/libaom/src/av1/common/warped_motion.c
diff --git a/third_party/aom/av1/common/warped_motion.h b/media/libaom/src/av1/common/warped_motion.h
similarity index 100%
rename from third_party/aom/av1/common/warped_motion.h
rename to media/libaom/src/av1/common/warped_motion.h
diff --git a/third_party/aom/av1/common/x86/av1_convolve_horiz_rs_sse4.c b/media/libaom/src/av1/common/x86/av1_convolve_horiz_rs_sse4.c
similarity index 100%
rename from third_party/aom/av1/common/x86/av1_convolve_horiz_rs_sse4.c
rename to media/libaom/src/av1/common/x86/av1_convolve_horiz_rs_sse4.c
diff --git a/third_party/aom/av1/common/x86/av1_convolve_scale_sse4.c b/media/libaom/src/av1/common/x86/av1_convolve_scale_sse4.c
similarity index 100%
rename from third_party/aom/av1/common/x86/av1_convolve_scale_sse4.c
rename to media/libaom/src/av1/common/x86/av1_convolve_scale_sse4.c
diff --git a/third_party/aom/av1/common/x86/av1_highbd_convolve_sse4.c b/media/libaom/src/av1/common/x86/av1_highbd_convolve_sse4.c
similarity index 100%
rename from third_party/aom/av1/common/x86/av1_highbd_convolve_sse4.c
rename to media/libaom/src/av1/common/x86/av1_highbd_convolve_sse4.c
diff --git a/third_party/aom/av1/common/x86/av1_inv_txfm_avx2.c b/media/libaom/src/av1/common/x86/av1_inv_txfm_avx2.c
similarity index 100%
rename from third_party/aom/av1/common/x86/av1_inv_txfm_avx2.c
rename to media/libaom/src/av1/common/x86/av1_inv_txfm_avx2.c
diff --git a/third_party/aom/av1/common/x86/av1_inv_txfm_avx2.h b/media/libaom/src/av1/common/x86/av1_inv_txfm_avx2.h
similarity index 100%
rename from third_party/aom/av1/common/x86/av1_inv_txfm_avx2.h
rename to media/libaom/src/av1/common/x86/av1_inv_txfm_avx2.h
diff --git a/third_party/aom/av1/common/x86/av1_inv_txfm_ssse3.c b/media/libaom/src/av1/common/x86/av1_inv_txfm_ssse3.c
similarity index 100%
rename from third_party/aom/av1/common/x86/av1_inv_txfm_ssse3.c
rename to media/libaom/src/av1/common/x86/av1_inv_txfm_ssse3.c
diff --git a/third_party/aom/av1/common/x86/av1_inv_txfm_ssse3.h b/media/libaom/src/av1/common/x86/av1_inv_txfm_ssse3.h
similarity index 100%
rename from third_party/aom/av1/common/x86/av1_inv_txfm_ssse3.h
rename to media/libaom/src/av1/common/x86/av1_inv_txfm_ssse3.h
diff --git a/third_party/aom/av1/common/x86/av1_txfm_sse2.h b/media/libaom/src/av1/common/x86/av1_txfm_sse2.h
similarity index 100%
rename from third_party/aom/av1/common/x86/av1_txfm_sse2.h
rename to media/libaom/src/av1/common/x86/av1_txfm_sse2.h
diff --git a/third_party/aom/av1/common/x86/av1_txfm_sse4.c b/media/libaom/src/av1/common/x86/av1_txfm_sse4.c
similarity index 100%
rename from third_party/aom/av1/common/x86/av1_txfm_sse4.c
rename to media/libaom/src/av1/common/x86/av1_txfm_sse4.c
diff --git a/third_party/aom/av1/common/x86/av1_txfm_sse4.h b/media/libaom/src/av1/common/x86/av1_txfm_sse4.h
similarity index 100%
rename from third_party/aom/av1/common/x86/av1_txfm_sse4.h
rename to media/libaom/src/av1/common/x86/av1_txfm_sse4.h
diff --git a/third_party/aom/av1/common/x86/cfl_avx2.c b/media/libaom/src/av1/common/x86/cfl_avx2.c
similarity index 100%
rename from third_party/aom/av1/common/x86/cfl_avx2.c
rename to media/libaom/src/av1/common/x86/cfl_avx2.c
diff --git a/third_party/aom/av1/common/x86/cfl_simd.h b/media/libaom/src/av1/common/x86/cfl_simd.h
similarity index 100%
rename from third_party/aom/av1/common/x86/cfl_simd.h
rename to media/libaom/src/av1/common/x86/cfl_simd.h
diff --git a/third_party/aom/av1/common/x86/cfl_sse2.c b/media/libaom/src/av1/common/x86/cfl_sse2.c
similarity index 100%
rename from third_party/aom/av1/common/x86/cfl_sse2.c
rename to media/libaom/src/av1/common/x86/cfl_sse2.c
diff --git a/third_party/aom/av1/common/x86/cfl_ssse3.c b/media/libaom/src/av1/common/x86/cfl_ssse3.c
similarity index 100%
rename from third_party/aom/av1/common/x86/cfl_ssse3.c
rename to media/libaom/src/av1/common/x86/cfl_ssse3.c
diff --git a/third_party/aom/av1/common/x86/convolve_2d_avx2.c b/media/libaom/src/av1/common/x86/convolve_2d_avx2.c
similarity index 100%
rename from third_party/aom/av1/common/x86/convolve_2d_avx2.c
rename to media/libaom/src/av1/common/x86/convolve_2d_avx2.c
diff --git a/third_party/aom/av1/common/x86/convolve_2d_sse2.c b/media/libaom/src/av1/common/x86/convolve_2d_sse2.c
similarity index 100%
rename from third_party/aom/av1/common/x86/convolve_2d_sse2.c
rename to media/libaom/src/av1/common/x86/convolve_2d_sse2.c
diff --git a/third_party/aom/av1/common/x86/convolve_avx2.c b/media/libaom/src/av1/common/x86/convolve_avx2.c
similarity index 100%
rename from third_party/aom/av1/common/x86/convolve_avx2.c
rename to media/libaom/src/av1/common/x86/convolve_avx2.c
diff --git a/third_party/aom/av1/common/x86/convolve_sse2.c b/media/libaom/src/av1/common/x86/convolve_sse2.c
similarity index 100%
rename from third_party/aom/av1/common/x86/convolve_sse2.c
rename to media/libaom/src/av1/common/x86/convolve_sse2.c
diff --git a/third_party/aom/av1/common/x86/filterintra_sse4.c b/media/libaom/src/av1/common/x86/filterintra_sse4.c
similarity index 100%
rename from third_party/aom/av1/common/x86/filterintra_sse4.c
rename to media/libaom/src/av1/common/x86/filterintra_sse4.c
diff --git a/third_party/aom/av1/common/x86/highbd_convolve_2d_avx2.c b/media/libaom/src/av1/common/x86/highbd_convolve_2d_avx2.c
similarity index 100%
rename from third_party/aom/av1/common/x86/highbd_convolve_2d_avx2.c
rename to media/libaom/src/av1/common/x86/highbd_convolve_2d_avx2.c
diff --git a/third_party/aom/av1/common/x86/highbd_convolve_2d_sse2.c b/media/libaom/src/av1/common/x86/highbd_convolve_2d_sse2.c
similarity index 100%
rename from third_party/aom/av1/common/x86/highbd_convolve_2d_sse2.c
rename to media/libaom/src/av1/common/x86/highbd_convolve_2d_sse2.c
diff --git a/third_party/aom/av1/common/x86/highbd_convolve_2d_sse4.c b/media/libaom/src/av1/common/x86/highbd_convolve_2d_sse4.c
similarity index 100%
rename from third_party/aom/av1/common/x86/highbd_convolve_2d_sse4.c
rename to media/libaom/src/av1/common/x86/highbd_convolve_2d_sse4.c
diff --git a/third_party/aom/av1/common/x86/highbd_convolve_2d_ssse3.c b/media/libaom/src/av1/common/x86/highbd_convolve_2d_ssse3.c
similarity index 100%
rename from third_party/aom/av1/common/x86/highbd_convolve_2d_ssse3.c
rename to media/libaom/src/av1/common/x86/highbd_convolve_2d_ssse3.c
diff --git a/third_party/aom/av1/common/x86/highbd_inv_txfm_avx2.c b/media/libaom/src/av1/common/x86/highbd_inv_txfm_avx2.c
similarity index 100%
rename from third_party/aom/av1/common/x86/highbd_inv_txfm_avx2.c
rename to media/libaom/src/av1/common/x86/highbd_inv_txfm_avx2.c
diff --git a/third_party/aom/av1/common/x86/highbd_inv_txfm_sse4.c b/media/libaom/src/av1/common/x86/highbd_inv_txfm_sse4.c
similarity index 100%
rename from third_party/aom/av1/common/x86/highbd_inv_txfm_sse4.c
rename to media/libaom/src/av1/common/x86/highbd_inv_txfm_sse4.c
diff --git a/third_party/aom/av1/common/x86/highbd_jnt_convolve_avx2.c b/media/libaom/src/av1/common/x86/highbd_jnt_convolve_avx2.c
similarity index 100%
rename from third_party/aom/av1/common/x86/highbd_jnt_convolve_avx2.c
rename to media/libaom/src/av1/common/x86/highbd_jnt_convolve_avx2.c
diff --git a/third_party/aom/av1/common/x86/highbd_jnt_convolve_sse4.c b/media/libaom/src/av1/common/x86/highbd_jnt_convolve_sse4.c
similarity index 100%
rename from third_party/aom/av1/common/x86/highbd_jnt_convolve_sse4.c
rename to media/libaom/src/av1/common/x86/highbd_jnt_convolve_sse4.c
diff --git a/third_party/aom/av1/common/x86/highbd_txfm_utility_sse4.h b/media/libaom/src/av1/common/x86/highbd_txfm_utility_sse4.h
similarity index 100%
rename from third_party/aom/av1/common/x86/highbd_txfm_utility_sse4.h
rename to media/libaom/src/av1/common/x86/highbd_txfm_utility_sse4.h
diff --git a/third_party/aom/av1/common/x86/highbd_warp_plane_sse4.c b/media/libaom/src/av1/common/x86/highbd_warp_plane_sse4.c
similarity index 100%
rename from third_party/aom/av1/common/x86/highbd_warp_plane_sse4.c
rename to media/libaom/src/av1/common/x86/highbd_warp_plane_sse4.c
diff --git a/third_party/aom/av1/common/x86/highbd_wiener_convolve_avx2.c b/media/libaom/src/av1/common/x86/highbd_wiener_convolve_avx2.c
similarity index 100%
rename from third_party/aom/av1/common/x86/highbd_wiener_convolve_avx2.c
rename to media/libaom/src/av1/common/x86/highbd_wiener_convolve_avx2.c
diff --git a/third_party/aom/av1/common/x86/highbd_wiener_convolve_ssse3.c b/media/libaom/src/av1/common/x86/highbd_wiener_convolve_ssse3.c
similarity index 100%
rename from third_party/aom/av1/common/x86/highbd_wiener_convolve_ssse3.c
rename to media/libaom/src/av1/common/x86/highbd_wiener_convolve_ssse3.c
diff --git a/third_party/aom/av1/common/x86/intra_edge_sse4.c b/media/libaom/src/av1/common/x86/intra_edge_sse4.c
similarity index 100%
rename from third_party/aom/av1/common/x86/intra_edge_sse4.c
rename to media/libaom/src/av1/common/x86/intra_edge_sse4.c
diff --git a/third_party/aom/av1/common/x86/jnt_convolve_avx2.c b/media/libaom/src/av1/common/x86/jnt_convolve_avx2.c
similarity index 100%
rename from third_party/aom/av1/common/x86/jnt_convolve_avx2.c
rename to media/libaom/src/av1/common/x86/jnt_convolve_avx2.c
diff --git a/third_party/aom/av1/common/x86/jnt_convolve_sse2.c b/media/libaom/src/av1/common/x86/jnt_convolve_sse2.c
similarity index 100%
rename from third_party/aom/av1/common/x86/jnt_convolve_sse2.c
rename to media/libaom/src/av1/common/x86/jnt_convolve_sse2.c
diff --git a/third_party/aom/av1/common/x86/jnt_convolve_ssse3.c b/media/libaom/src/av1/common/x86/jnt_convolve_ssse3.c
similarity index 100%
rename from third_party/aom/av1/common/x86/jnt_convolve_ssse3.c
rename to media/libaom/src/av1/common/x86/jnt_convolve_ssse3.c
diff --git a/third_party/aom/av1/common/x86/reconinter_avx2.c b/media/libaom/src/av1/common/x86/reconinter_avx2.c
similarity index 100%
rename from third_party/aom/av1/common/x86/reconinter_avx2.c
rename to media/libaom/src/av1/common/x86/reconinter_avx2.c
diff --git a/third_party/aom/av1/common/x86/reconinter_sse4.c b/media/libaom/src/av1/common/x86/reconinter_sse4.c
similarity index 100%
rename from third_party/aom/av1/common/x86/reconinter_sse4.c
rename to media/libaom/src/av1/common/x86/reconinter_sse4.c
diff --git a/third_party/aom/av1/common/x86/reconinter_ssse3.c b/media/libaom/src/av1/common/x86/reconinter_ssse3.c
similarity index 100%
rename from third_party/aom/av1/common/x86/reconinter_ssse3.c
rename to media/libaom/src/av1/common/x86/reconinter_ssse3.c
diff --git a/third_party/aom/av1/common/x86/selfguided_avx2.c b/media/libaom/src/av1/common/x86/selfguided_avx2.c
similarity index 100%
rename from third_party/aom/av1/common/x86/selfguided_avx2.c
rename to media/libaom/src/av1/common/x86/selfguided_avx2.c
diff --git a/third_party/aom/av1/common/x86/selfguided_sse4.c b/media/libaom/src/av1/common/x86/selfguided_sse4.c
similarity index 100%
rename from third_party/aom/av1/common/x86/selfguided_sse4.c
rename to media/libaom/src/av1/common/x86/selfguided_sse4.c
diff --git a/third_party/aom/av1/common/x86/warp_plane_sse4.c b/media/libaom/src/av1/common/x86/warp_plane_sse4.c
similarity index 100%
rename from third_party/aom/av1/common/x86/warp_plane_sse4.c
rename to media/libaom/src/av1/common/x86/warp_plane_sse4.c
diff --git a/third_party/aom/av1/common/x86/wiener_convolve_avx2.c b/media/libaom/src/av1/common/x86/wiener_convolve_avx2.c
similarity index 100%
rename from third_party/aom/av1/common/x86/wiener_convolve_avx2.c
rename to media/libaom/src/av1/common/x86/wiener_convolve_avx2.c
diff --git a/third_party/aom/av1/common/x86/wiener_convolve_sse2.c b/media/libaom/src/av1/common/x86/wiener_convolve_sse2.c
similarity index 100%
rename from third_party/aom/av1/common/x86/wiener_convolve_sse2.c
rename to media/libaom/src/av1/common/x86/wiener_convolve_sse2.c
diff --git a/third_party/aom/av1/decoder/accounting.c b/media/libaom/src/av1/decoder/accounting.c
similarity index 100%
rename from third_party/aom/av1/decoder/accounting.c
rename to media/libaom/src/av1/decoder/accounting.c
diff --git a/third_party/aom/av1/decoder/accounting.h b/media/libaom/src/av1/decoder/accounting.h
similarity index 100%
rename from third_party/aom/av1/decoder/accounting.h
rename to media/libaom/src/av1/decoder/accounting.h
diff --git a/third_party/aom/av1/decoder/decodeframe.c b/media/libaom/src/av1/decoder/decodeframe.c
similarity index 100%
rename from third_party/aom/av1/decoder/decodeframe.c
rename to media/libaom/src/av1/decoder/decodeframe.c
diff --git a/third_party/aom/av1/decoder/decodeframe.h b/media/libaom/src/av1/decoder/decodeframe.h
similarity index 100%
rename from third_party/aom/av1/decoder/decodeframe.h
rename to media/libaom/src/av1/decoder/decodeframe.h
diff --git a/third_party/aom/av1/decoder/decodemv.c b/media/libaom/src/av1/decoder/decodemv.c
similarity index 100%
rename from third_party/aom/av1/decoder/decodemv.c
rename to media/libaom/src/av1/decoder/decodemv.c
diff --git a/third_party/aom/av1/decoder/decodemv.h b/media/libaom/src/av1/decoder/decodemv.h
similarity index 100%
rename from third_party/aom/av1/decoder/decodemv.h
rename to media/libaom/src/av1/decoder/decodemv.h
diff --git a/third_party/aom/av1/decoder/decoder.c b/media/libaom/src/av1/decoder/decoder.c
similarity index 100%
rename from third_party/aom/av1/decoder/decoder.c
rename to media/libaom/src/av1/decoder/decoder.c
diff --git a/third_party/aom/av1/decoder/decoder.h b/media/libaom/src/av1/decoder/decoder.h
similarity index 100%
rename from third_party/aom/av1/decoder/decoder.h
rename to media/libaom/src/av1/decoder/decoder.h
diff --git a/third_party/aom/av1/decoder/decodetxb.c b/media/libaom/src/av1/decoder/decodetxb.c
similarity index 100%
rename from third_party/aom/av1/decoder/decodetxb.c
rename to media/libaom/src/av1/decoder/decodetxb.c
diff --git a/third_party/aom/av1/decoder/decodetxb.h b/media/libaom/src/av1/decoder/decodetxb.h
similarity index 100%
rename from third_party/aom/av1/decoder/decodetxb.h
rename to media/libaom/src/av1/decoder/decodetxb.h
diff --git a/third_party/aom/av1/decoder/detokenize.c b/media/libaom/src/av1/decoder/detokenize.c
similarity index 100%
rename from third_party/aom/av1/decoder/detokenize.c
rename to media/libaom/src/av1/decoder/detokenize.c
diff --git a/third_party/aom/av1/decoder/detokenize.h b/media/libaom/src/av1/decoder/detokenize.h
similarity index 100%
rename from third_party/aom/av1/decoder/detokenize.h
rename to media/libaom/src/av1/decoder/detokenize.h
diff --git a/third_party/aom/av1/decoder/dthread.c b/media/libaom/src/av1/decoder/dthread.c
similarity index 100%
rename from third_party/aom/av1/decoder/dthread.c
rename to media/libaom/src/av1/decoder/dthread.c
diff --git a/third_party/aom/av1/decoder/dthread.h b/media/libaom/src/av1/decoder/dthread.h
similarity index 100%
rename from third_party/aom/av1/decoder/dthread.h
rename to media/libaom/src/av1/decoder/dthread.h
diff --git a/third_party/aom/av1/decoder/inspection.c b/media/libaom/src/av1/decoder/inspection.c
similarity index 100%
rename from third_party/aom/av1/decoder/inspection.c
rename to media/libaom/src/av1/decoder/inspection.c
diff --git a/third_party/aom/av1/decoder/inspection.h b/media/libaom/src/av1/decoder/inspection.h
similarity index 100%
rename from third_party/aom/av1/decoder/inspection.h
rename to media/libaom/src/av1/decoder/inspection.h
diff --git a/third_party/aom/av1/decoder/obu.c b/media/libaom/src/av1/decoder/obu.c
similarity index 100%
rename from third_party/aom/av1/decoder/obu.c
rename to media/libaom/src/av1/decoder/obu.c
diff --git a/third_party/aom/av1/decoder/obu.h b/media/libaom/src/av1/decoder/obu.h
similarity index 100%
rename from third_party/aom/av1/decoder/obu.h
rename to media/libaom/src/av1/decoder/obu.h
diff --git a/third_party/aom/av1/encoder/aq_complexity.c b/media/libaom/src/av1/encoder/aq_complexity.c
similarity index 100%
rename from third_party/aom/av1/encoder/aq_complexity.c
rename to media/libaom/src/av1/encoder/aq_complexity.c
diff --git a/third_party/aom/av1/encoder/aq_complexity.h b/media/libaom/src/av1/encoder/aq_complexity.h
similarity index 100%
rename from third_party/aom/av1/encoder/aq_complexity.h
rename to media/libaom/src/av1/encoder/aq_complexity.h
diff --git a/third_party/aom/av1/encoder/aq_cyclicrefresh.c b/media/libaom/src/av1/encoder/aq_cyclicrefresh.c
similarity index 100%
rename from third_party/aom/av1/encoder/aq_cyclicrefresh.c
rename to media/libaom/src/av1/encoder/aq_cyclicrefresh.c
diff --git a/third_party/aom/av1/encoder/aq_cyclicrefresh.h b/media/libaom/src/av1/encoder/aq_cyclicrefresh.h
similarity index 100%
rename from third_party/aom/av1/encoder/aq_cyclicrefresh.h
rename to media/libaom/src/av1/encoder/aq_cyclicrefresh.h
diff --git a/third_party/aom/av1/encoder/aq_variance.c b/media/libaom/src/av1/encoder/aq_variance.c
similarity index 100%
rename from third_party/aom/av1/encoder/aq_variance.c
rename to media/libaom/src/av1/encoder/aq_variance.c
diff --git a/third_party/aom/av1/encoder/aq_variance.h b/media/libaom/src/av1/encoder/aq_variance.h
similarity index 100%
rename from third_party/aom/av1/encoder/aq_variance.h
rename to media/libaom/src/av1/encoder/aq_variance.h
diff --git a/third_party/aom/av1/encoder/arm/neon/quantize_neon.c b/media/libaom/src/av1/encoder/arm/neon/quantize_neon.c
similarity index 100%
rename from third_party/aom/av1/encoder/arm/neon/quantize_neon.c
rename to media/libaom/src/av1/encoder/arm/neon/quantize_neon.c
diff --git a/third_party/aom/av1/encoder/av1_fwd_txfm1d.c b/media/libaom/src/av1/encoder/av1_fwd_txfm1d.c
similarity index 100%
rename from third_party/aom/av1/encoder/av1_fwd_txfm1d.c
rename to media/libaom/src/av1/encoder/av1_fwd_txfm1d.c
diff --git a/third_party/aom/av1/encoder/av1_fwd_txfm1d.h b/media/libaom/src/av1/encoder/av1_fwd_txfm1d.h
similarity index 100%
rename from third_party/aom/av1/encoder/av1_fwd_txfm1d.h
rename to media/libaom/src/av1/encoder/av1_fwd_txfm1d.h
diff --git a/third_party/aom/av1/encoder/av1_fwd_txfm1d_cfg.h b/media/libaom/src/av1/encoder/av1_fwd_txfm1d_cfg.h
similarity index 100%
rename from third_party/aom/av1/encoder/av1_fwd_txfm1d_cfg.h
rename to media/libaom/src/av1/encoder/av1_fwd_txfm1d_cfg.h
diff --git a/third_party/aom/av1/encoder/av1_fwd_txfm2d.c b/media/libaom/src/av1/encoder/av1_fwd_txfm2d.c
similarity index 100%
rename from third_party/aom/av1/encoder/av1_fwd_txfm2d.c
rename to media/libaom/src/av1/encoder/av1_fwd_txfm2d.c
diff --git a/third_party/aom/av1/encoder/av1_quantize.c b/media/libaom/src/av1/encoder/av1_quantize.c
similarity index 100%
rename from third_party/aom/av1/encoder/av1_quantize.c
rename to media/libaom/src/av1/encoder/av1_quantize.c
diff --git a/third_party/aom/av1/encoder/av1_quantize.h b/media/libaom/src/av1/encoder/av1_quantize.h
similarity index 100%
rename from third_party/aom/av1/encoder/av1_quantize.h
rename to media/libaom/src/av1/encoder/av1_quantize.h
diff --git a/third_party/aom/av1/encoder/bitstream.c b/media/libaom/src/av1/encoder/bitstream.c
similarity index 100%
rename from third_party/aom/av1/encoder/bitstream.c
rename to media/libaom/src/av1/encoder/bitstream.c
diff --git a/third_party/aom/av1/encoder/bitstream.h b/media/libaom/src/av1/encoder/bitstream.h
similarity index 100%
rename from third_party/aom/av1/encoder/bitstream.h
rename to media/libaom/src/av1/encoder/bitstream.h
diff --git a/third_party/aom/av1/encoder/block.h b/media/libaom/src/av1/encoder/block.h
similarity index 100%
rename from third_party/aom/av1/encoder/block.h
rename to media/libaom/src/av1/encoder/block.h
diff --git a/third_party/aom/av1/encoder/blockiness.c b/media/libaom/src/av1/encoder/blockiness.c
similarity index 100%
rename from third_party/aom/av1/encoder/blockiness.c
rename to media/libaom/src/av1/encoder/blockiness.c
diff --git a/third_party/aom/av1/encoder/context_tree.c b/media/libaom/src/av1/encoder/context_tree.c
similarity index 100%
rename from third_party/aom/av1/encoder/context_tree.c
rename to media/libaom/src/av1/encoder/context_tree.c
diff --git a/third_party/aom/av1/encoder/context_tree.h b/media/libaom/src/av1/encoder/context_tree.h
similarity index 100%
rename from third_party/aom/av1/encoder/context_tree.h
rename to media/libaom/src/av1/encoder/context_tree.h
diff --git a/third_party/aom/av1/encoder/corner_detect.c b/media/libaom/src/av1/encoder/corner_detect.c
similarity index 100%
rename from third_party/aom/av1/encoder/corner_detect.c
rename to media/libaom/src/av1/encoder/corner_detect.c
diff --git a/third_party/aom/av1/encoder/corner_detect.h b/media/libaom/src/av1/encoder/corner_detect.h
similarity index 100%
rename from third_party/aom/av1/encoder/corner_detect.h
rename to media/libaom/src/av1/encoder/corner_detect.h
diff --git a/third_party/aom/av1/encoder/corner_match.c b/media/libaom/src/av1/encoder/corner_match.c
similarity index 100%
rename from third_party/aom/av1/encoder/corner_match.c
rename to media/libaom/src/av1/encoder/corner_match.c
diff --git a/third_party/aom/av1/encoder/corner_match.h b/media/libaom/src/av1/encoder/corner_match.h
similarity index 100%
rename from third_party/aom/av1/encoder/corner_match.h
rename to media/libaom/src/av1/encoder/corner_match.h
diff --git a/third_party/aom/av1/encoder/cost.c b/media/libaom/src/av1/encoder/cost.c
similarity index 100%
rename from third_party/aom/av1/encoder/cost.c
rename to media/libaom/src/av1/encoder/cost.c
diff --git a/third_party/aom/av1/encoder/cost.h b/media/libaom/src/av1/encoder/cost.h
similarity index 100%
rename from third_party/aom/av1/encoder/cost.h
rename to media/libaom/src/av1/encoder/cost.h
diff --git a/third_party/aom/av1/encoder/dwt.c b/media/libaom/src/av1/encoder/dwt.c
similarity index 100%
rename from third_party/aom/av1/encoder/dwt.c
rename to media/libaom/src/av1/encoder/dwt.c
diff --git a/third_party/aom/av1/encoder/dwt.h b/media/libaom/src/av1/encoder/dwt.h
similarity index 100%
rename from third_party/aom/av1/encoder/dwt.h
rename to media/libaom/src/av1/encoder/dwt.h
diff --git a/third_party/aom/av1/encoder/encodeframe.c b/media/libaom/src/av1/encoder/encodeframe.c
similarity index 100%
rename from third_party/aom/av1/encoder/encodeframe.c
rename to media/libaom/src/av1/encoder/encodeframe.c
diff --git a/third_party/aom/av1/encoder/encodeframe.h b/media/libaom/src/av1/encoder/encodeframe.h
similarity index 100%
rename from third_party/aom/av1/encoder/encodeframe.h
rename to media/libaom/src/av1/encoder/encodeframe.h
diff --git a/third_party/aom/av1/encoder/encodemb.c b/media/libaom/src/av1/encoder/encodemb.c
similarity index 100%
rename from third_party/aom/av1/encoder/encodemb.c
rename to media/libaom/src/av1/encoder/encodemb.c
diff --git a/third_party/aom/av1/encoder/encodemb.h b/media/libaom/src/av1/encoder/encodemb.h
similarity index 100%
rename from third_party/aom/av1/encoder/encodemb.h
rename to media/libaom/src/av1/encoder/encodemb.h
diff --git a/third_party/aom/av1/encoder/encodemv.c b/media/libaom/src/av1/encoder/encodemv.c
similarity index 100%
rename from third_party/aom/av1/encoder/encodemv.c
rename to media/libaom/src/av1/encoder/encodemv.c
diff --git a/third_party/aom/av1/encoder/encodemv.h b/media/libaom/src/av1/encoder/encodemv.h
similarity index 100%
rename from third_party/aom/av1/encoder/encodemv.h
rename to media/libaom/src/av1/encoder/encodemv.h
diff --git a/third_party/aom/av1/encoder/encoder.c b/media/libaom/src/av1/encoder/encoder.c
similarity index 100%
rename from third_party/aom/av1/encoder/encoder.c
rename to media/libaom/src/av1/encoder/encoder.c
diff --git a/third_party/aom/av1/encoder/encoder.h b/media/libaom/src/av1/encoder/encoder.h
similarity index 100%
rename from third_party/aom/av1/encoder/encoder.h
rename to media/libaom/src/av1/encoder/encoder.h
diff --git a/third_party/aom/av1/encoder/encodetxb.c b/media/libaom/src/av1/encoder/encodetxb.c
similarity index 100%
rename from third_party/aom/av1/encoder/encodetxb.c
rename to media/libaom/src/av1/encoder/encodetxb.c
diff --git a/third_party/aom/av1/encoder/encodetxb.h b/media/libaom/src/av1/encoder/encodetxb.h
similarity index 100%
rename from third_party/aom/av1/encoder/encodetxb.h
rename to media/libaom/src/av1/encoder/encodetxb.h
diff --git a/third_party/aom/av1/encoder/ethread.c b/media/libaom/src/av1/encoder/ethread.c
similarity index 100%
rename from third_party/aom/av1/encoder/ethread.c
rename to media/libaom/src/av1/encoder/ethread.c
diff --git a/third_party/aom/av1/encoder/ethread.h b/media/libaom/src/av1/encoder/ethread.h
similarity index 100%
rename from third_party/aom/av1/encoder/ethread.h
rename to media/libaom/src/av1/encoder/ethread.h
diff --git a/third_party/aom/av1/encoder/extend.c b/media/libaom/src/av1/encoder/extend.c
similarity index 100%
rename from third_party/aom/av1/encoder/extend.c
rename to media/libaom/src/av1/encoder/extend.c
diff --git a/third_party/aom/av1/encoder/extend.h b/media/libaom/src/av1/encoder/extend.h
similarity index 100%
rename from third_party/aom/av1/encoder/extend.h
rename to media/libaom/src/av1/encoder/extend.h
diff --git a/third_party/aom/av1/encoder/firstpass.c b/media/libaom/src/av1/encoder/firstpass.c
similarity index 100%
rename from third_party/aom/av1/encoder/firstpass.c
rename to media/libaom/src/av1/encoder/firstpass.c
diff --git a/third_party/aom/av1/encoder/firstpass.h b/media/libaom/src/av1/encoder/firstpass.h
similarity index 100%
rename from third_party/aom/av1/encoder/firstpass.h
rename to media/libaom/src/av1/encoder/firstpass.h
diff --git a/third_party/aom/av1/encoder/global_motion.c b/media/libaom/src/av1/encoder/global_motion.c
similarity index 100%
rename from third_party/aom/av1/encoder/global_motion.c
rename to media/libaom/src/av1/encoder/global_motion.c
diff --git a/third_party/aom/av1/encoder/global_motion.h b/media/libaom/src/av1/encoder/global_motion.h
similarity index 100%
rename from third_party/aom/av1/encoder/global_motion.h
rename to media/libaom/src/av1/encoder/global_motion.h
diff --git a/third_party/aom/av1/encoder/grain_test_vectors.h b/media/libaom/src/av1/encoder/grain_test_vectors.h
similarity index 100%
rename from third_party/aom/av1/encoder/grain_test_vectors.h
rename to media/libaom/src/av1/encoder/grain_test_vectors.h
diff --git a/third_party/aom/av1/encoder/hash.c b/media/libaom/src/av1/encoder/hash.c
similarity index 100%
rename from third_party/aom/av1/encoder/hash.c
rename to media/libaom/src/av1/encoder/hash.c
diff --git a/third_party/aom/av1/encoder/hash.h b/media/libaom/src/av1/encoder/hash.h
similarity index 100%
rename from third_party/aom/av1/encoder/hash.h
rename to media/libaom/src/av1/encoder/hash.h
diff --git a/third_party/aom/av1/encoder/hash_motion.c b/media/libaom/src/av1/encoder/hash_motion.c
similarity index 100%
rename from third_party/aom/av1/encoder/hash_motion.c
rename to media/libaom/src/av1/encoder/hash_motion.c
diff --git a/third_party/aom/av1/encoder/hash_motion.h b/media/libaom/src/av1/encoder/hash_motion.h
similarity index 100%
rename from third_party/aom/av1/encoder/hash_motion.h
rename to media/libaom/src/av1/encoder/hash_motion.h
diff --git a/third_party/aom/av1/encoder/hybrid_fwd_txfm.c b/media/libaom/src/av1/encoder/hybrid_fwd_txfm.c
similarity index 100%
rename from third_party/aom/av1/encoder/hybrid_fwd_txfm.c
rename to media/libaom/src/av1/encoder/hybrid_fwd_txfm.c
diff --git a/third_party/aom/av1/encoder/hybrid_fwd_txfm.h b/media/libaom/src/av1/encoder/hybrid_fwd_txfm.h
similarity index 100%
rename from third_party/aom/av1/encoder/hybrid_fwd_txfm.h
rename to media/libaom/src/av1/encoder/hybrid_fwd_txfm.h
diff --git a/third_party/aom/av1/encoder/k_means_template.h b/media/libaom/src/av1/encoder/k_means_template.h
similarity index 100%
rename from third_party/aom/av1/encoder/k_means_template.h
rename to media/libaom/src/av1/encoder/k_means_template.h
diff --git a/third_party/aom/av1/encoder/lookahead.c b/media/libaom/src/av1/encoder/lookahead.c
similarity index 100%
rename from third_party/aom/av1/encoder/lookahead.c
rename to media/libaom/src/av1/encoder/lookahead.c
diff --git a/third_party/aom/av1/encoder/lookahead.h b/media/libaom/src/av1/encoder/lookahead.h
similarity index 100%
rename from third_party/aom/av1/encoder/lookahead.h
rename to media/libaom/src/av1/encoder/lookahead.h
diff --git a/third_party/aom/av1/encoder/mathutils.h b/media/libaom/src/av1/encoder/mathutils.h
similarity index 100%
rename from third_party/aom/av1/encoder/mathutils.h
rename to media/libaom/src/av1/encoder/mathutils.h
diff --git a/third_party/aom/av1/encoder/mbgraph.c b/media/libaom/src/av1/encoder/mbgraph.c
similarity index 100%
rename from third_party/aom/av1/encoder/mbgraph.c
rename to media/libaom/src/av1/encoder/mbgraph.c
diff --git a/third_party/aom/av1/encoder/mbgraph.h b/media/libaom/src/av1/encoder/mbgraph.h
similarity index 100%
rename from third_party/aom/av1/encoder/mbgraph.h
rename to media/libaom/src/av1/encoder/mbgraph.h
diff --git a/third_party/aom/av1/encoder/mcomp.c b/media/libaom/src/av1/encoder/mcomp.c
similarity index 100%
rename from third_party/aom/av1/encoder/mcomp.c
rename to media/libaom/src/av1/encoder/mcomp.c
diff --git a/third_party/aom/av1/encoder/mcomp.h b/media/libaom/src/av1/encoder/mcomp.h
similarity index 100%
rename from third_party/aom/av1/encoder/mcomp.h
rename to media/libaom/src/av1/encoder/mcomp.h
diff --git a/third_party/aom/av1/encoder/mips/msa/error_msa.c b/media/libaom/src/av1/encoder/mips/msa/error_msa.c
similarity index 100%
rename from third_party/aom/av1/encoder/mips/msa/error_msa.c
rename to media/libaom/src/av1/encoder/mips/msa/error_msa.c
diff --git a/third_party/aom/av1/encoder/mips/msa/fdct4x4_msa.c b/media/libaom/src/av1/encoder/mips/msa/fdct4x4_msa.c
similarity index 100%
rename from third_party/aom/av1/encoder/mips/msa/fdct4x4_msa.c
rename to media/libaom/src/av1/encoder/mips/msa/fdct4x4_msa.c
diff --git a/third_party/aom/av1/encoder/mips/msa/temporal_filter_msa.c b/media/libaom/src/av1/encoder/mips/msa/temporal_filter_msa.c
similarity index 100%
rename from third_party/aom/av1/encoder/mips/msa/temporal_filter_msa.c
rename to media/libaom/src/av1/encoder/mips/msa/temporal_filter_msa.c
diff --git a/third_party/aom/av1/encoder/ml.c b/media/libaom/src/av1/encoder/ml.c
similarity index 100%
rename from third_party/aom/av1/encoder/ml.c
rename to media/libaom/src/av1/encoder/ml.c
diff --git a/third_party/aom/av1/encoder/ml.h b/media/libaom/src/av1/encoder/ml.h
similarity index 100%
rename from third_party/aom/av1/encoder/ml.h
rename to media/libaom/src/av1/encoder/ml.h
diff --git a/third_party/aom/av1/encoder/palette.c b/media/libaom/src/av1/encoder/palette.c
similarity index 100%
rename from third_party/aom/av1/encoder/palette.c
rename to media/libaom/src/av1/encoder/palette.c
diff --git a/third_party/aom/av1/encoder/palette.h b/media/libaom/src/av1/encoder/palette.h
similarity index 100%
rename from third_party/aom/av1/encoder/palette.h
rename to media/libaom/src/av1/encoder/palette.h
diff --git a/third_party/aom/av1/encoder/partition_model_weights.h b/media/libaom/src/av1/encoder/partition_model_weights.h
similarity index 100%
rename from third_party/aom/av1/encoder/partition_model_weights.h
rename to media/libaom/src/av1/encoder/partition_model_weights.h
diff --git a/third_party/aom/av1/encoder/pickcdef.c b/media/libaom/src/av1/encoder/pickcdef.c
similarity index 100%
rename from third_party/aom/av1/encoder/pickcdef.c
rename to media/libaom/src/av1/encoder/pickcdef.c
diff --git a/third_party/aom/av1/encoder/picklpf.c b/media/libaom/src/av1/encoder/picklpf.c
similarity index 100%
rename from third_party/aom/av1/encoder/picklpf.c
rename to media/libaom/src/av1/encoder/picklpf.c
diff --git a/third_party/aom/av1/encoder/picklpf.h b/media/libaom/src/av1/encoder/picklpf.h
similarity index 100%
rename from third_party/aom/av1/encoder/picklpf.h
rename to media/libaom/src/av1/encoder/picklpf.h
diff --git a/third_party/aom/av1/encoder/pickrst.c b/media/libaom/src/av1/encoder/pickrst.c
similarity index 100%
rename from third_party/aom/av1/encoder/pickrst.c
rename to media/libaom/src/av1/encoder/pickrst.c
diff --git a/third_party/aom/av1/encoder/pickrst.h b/media/libaom/src/av1/encoder/pickrst.h
similarity index 100%
rename from third_party/aom/av1/encoder/pickrst.h
rename to media/libaom/src/av1/encoder/pickrst.h
diff --git a/third_party/aom/av1/encoder/pustats.h b/media/libaom/src/av1/encoder/pustats.h
similarity index 100%
rename from third_party/aom/av1/encoder/pustats.h
rename to media/libaom/src/av1/encoder/pustats.h
diff --git a/third_party/aom/av1/encoder/random.h b/media/libaom/src/av1/encoder/random.h
similarity index 100%
rename from third_party/aom/av1/encoder/random.h
rename to media/libaom/src/av1/encoder/random.h
diff --git a/third_party/aom/av1/encoder/ransac.c b/media/libaom/src/av1/encoder/ransac.c
similarity index 100%
rename from third_party/aom/av1/encoder/ransac.c
rename to media/libaom/src/av1/encoder/ransac.c
diff --git a/third_party/aom/av1/encoder/ransac.h b/media/libaom/src/av1/encoder/ransac.h
similarity index 100%
rename from third_party/aom/av1/encoder/ransac.h
rename to media/libaom/src/av1/encoder/ransac.h
diff --git a/third_party/aom/av1/encoder/rate_distortion_model_params.h b/media/libaom/src/av1/encoder/rate_distortion_model_params.h
similarity index 100%
rename from third_party/aom/av1/encoder/rate_distortion_model_params.h
rename to media/libaom/src/av1/encoder/rate_distortion_model_params.h
diff --git a/third_party/aom/av1/encoder/ratectrl.c b/media/libaom/src/av1/encoder/ratectrl.c
similarity index 100%
rename from third_party/aom/av1/encoder/ratectrl.c
rename to media/libaom/src/av1/encoder/ratectrl.c
diff --git a/third_party/aom/av1/encoder/ratectrl.h b/media/libaom/src/av1/encoder/ratectrl.h
similarity index 100%
rename from third_party/aom/av1/encoder/ratectrl.h
rename to media/libaom/src/av1/encoder/ratectrl.h
diff --git a/third_party/aom/av1/encoder/rd.c b/media/libaom/src/av1/encoder/rd.c
similarity index 100%
rename from third_party/aom/av1/encoder/rd.c
rename to media/libaom/src/av1/encoder/rd.c
diff --git a/third_party/aom/av1/encoder/rd.h b/media/libaom/src/av1/encoder/rd.h
similarity index 100%
rename from third_party/aom/av1/encoder/rd.h
rename to media/libaom/src/av1/encoder/rd.h
diff --git a/third_party/aom/av1/encoder/rdopt.c b/media/libaom/src/av1/encoder/rdopt.c
similarity index 100%
rename from third_party/aom/av1/encoder/rdopt.c
rename to media/libaom/src/av1/encoder/rdopt.c
diff --git a/third_party/aom/av1/encoder/rdopt.h b/media/libaom/src/av1/encoder/rdopt.h
similarity index 100%
rename from third_party/aom/av1/encoder/rdopt.h
rename to media/libaom/src/av1/encoder/rdopt.h
diff --git a/third_party/aom/av1/encoder/reconinter_enc.c b/media/libaom/src/av1/encoder/reconinter_enc.c
similarity index 100%
rename from third_party/aom/av1/encoder/reconinter_enc.c
rename to media/libaom/src/av1/encoder/reconinter_enc.c
diff --git a/third_party/aom/av1/encoder/reconinter_enc.h b/media/libaom/src/av1/encoder/reconinter_enc.h
similarity index 100%
rename from third_party/aom/av1/encoder/reconinter_enc.h
rename to media/libaom/src/av1/encoder/reconinter_enc.h
diff --git a/third_party/aom/av1/encoder/segmentation.c b/media/libaom/src/av1/encoder/segmentation.c
similarity index 100%
rename from third_party/aom/av1/encoder/segmentation.c
rename to media/libaom/src/av1/encoder/segmentation.c
diff --git a/third_party/aom/av1/encoder/segmentation.h b/media/libaom/src/av1/encoder/segmentation.h
similarity index 100%
rename from third_party/aom/av1/encoder/segmentation.h
rename to media/libaom/src/av1/encoder/segmentation.h
diff --git a/third_party/aom/av1/encoder/speed_features.c b/media/libaom/src/av1/encoder/speed_features.c
similarity index 100%
rename from third_party/aom/av1/encoder/speed_features.c
rename to media/libaom/src/av1/encoder/speed_features.c
diff --git a/third_party/aom/av1/encoder/speed_features.h b/media/libaom/src/av1/encoder/speed_features.h
similarity index 100%
rename from third_party/aom/av1/encoder/speed_features.h
rename to media/libaom/src/av1/encoder/speed_features.h
diff --git a/third_party/aom/av1/encoder/temporal_filter.c b/media/libaom/src/av1/encoder/temporal_filter.c
similarity index 100%
rename from third_party/aom/av1/encoder/temporal_filter.c
rename to media/libaom/src/av1/encoder/temporal_filter.c
diff --git a/third_party/aom/av1/encoder/temporal_filter.h b/media/libaom/src/av1/encoder/temporal_filter.h
similarity index 100%
rename from third_party/aom/av1/encoder/temporal_filter.h
rename to media/libaom/src/av1/encoder/temporal_filter.h
diff --git a/third_party/aom/av1/encoder/tokenize.c b/media/libaom/src/av1/encoder/tokenize.c
similarity index 100%
rename from third_party/aom/av1/encoder/tokenize.c
rename to media/libaom/src/av1/encoder/tokenize.c
diff --git a/third_party/aom/av1/encoder/tokenize.h b/media/libaom/src/av1/encoder/tokenize.h
similarity index 100%
rename from third_party/aom/av1/encoder/tokenize.h
rename to media/libaom/src/av1/encoder/tokenize.h
diff --git a/third_party/aom/av1/encoder/tx_prune_model_weights.h b/media/libaom/src/av1/encoder/tx_prune_model_weights.h
similarity index 100%
rename from third_party/aom/av1/encoder/tx_prune_model_weights.h
rename to media/libaom/src/av1/encoder/tx_prune_model_weights.h
diff --git a/third_party/aom/av1/encoder/wedge_utils.c b/media/libaom/src/av1/encoder/wedge_utils.c
similarity index 100%
rename from third_party/aom/av1/encoder/wedge_utils.c
rename to media/libaom/src/av1/encoder/wedge_utils.c
diff --git a/third_party/aom/av1/encoder/x86/av1_fwd_txfm1d_sse4.c b/media/libaom/src/av1/encoder/x86/av1_fwd_txfm1d_sse4.c
similarity index 100%
rename from third_party/aom/av1/encoder/x86/av1_fwd_txfm1d_sse4.c
rename to media/libaom/src/av1/encoder/x86/av1_fwd_txfm1d_sse4.c
diff --git a/third_party/aom/av1/encoder/x86/av1_fwd_txfm2d_avx2.c b/media/libaom/src/av1/encoder/x86/av1_fwd_txfm2d_avx2.c
similarity index 100%
rename from third_party/aom/av1/encoder/x86/av1_fwd_txfm2d_avx2.c
rename to media/libaom/src/av1/encoder/x86/av1_fwd_txfm2d_avx2.c
diff --git a/third_party/aom/av1/encoder/x86/av1_fwd_txfm2d_sse4.c b/media/libaom/src/av1/encoder/x86/av1_fwd_txfm2d_sse4.c
similarity index 100%
rename from third_party/aom/av1/encoder/x86/av1_fwd_txfm2d_sse4.c
rename to media/libaom/src/av1/encoder/x86/av1_fwd_txfm2d_sse4.c
diff --git a/third_party/aom/av1/encoder/x86/av1_fwd_txfm_avx2.h b/media/libaom/src/av1/encoder/x86/av1_fwd_txfm_avx2.h
similarity index 100%
rename from third_party/aom/av1/encoder/x86/av1_fwd_txfm_avx2.h
rename to media/libaom/src/av1/encoder/x86/av1_fwd_txfm_avx2.h
diff --git a/third_party/aom/av1/encoder/x86/av1_fwd_txfm_sse2.c b/media/libaom/src/av1/encoder/x86/av1_fwd_txfm_sse2.c
similarity index 100%
rename from third_party/aom/av1/encoder/x86/av1_fwd_txfm_sse2.c
rename to media/libaom/src/av1/encoder/x86/av1_fwd_txfm_sse2.c
diff --git a/third_party/aom/av1/encoder/x86/av1_fwd_txfm_sse2.h b/media/libaom/src/av1/encoder/x86/av1_fwd_txfm_sse2.h
similarity index 100%
rename from third_party/aom/av1/encoder/x86/av1_fwd_txfm_sse2.h
rename to media/libaom/src/av1/encoder/x86/av1_fwd_txfm_sse2.h
diff --git a/third_party/aom/av1/encoder/x86/av1_highbd_quantize_avx2.c b/media/libaom/src/av1/encoder/x86/av1_highbd_quantize_avx2.c
similarity index 100%
rename from third_party/aom/av1/encoder/x86/av1_highbd_quantize_avx2.c
rename to media/libaom/src/av1/encoder/x86/av1_highbd_quantize_avx2.c
diff --git a/third_party/aom/av1/encoder/x86/av1_highbd_quantize_sse4.c b/media/libaom/src/av1/encoder/x86/av1_highbd_quantize_sse4.c
similarity index 100%
rename from third_party/aom/av1/encoder/x86/av1_highbd_quantize_sse4.c
rename to media/libaom/src/av1/encoder/x86/av1_highbd_quantize_sse4.c
diff --git a/third_party/aom/av1/encoder/x86/av1_quantize_avx2.c b/media/libaom/src/av1/encoder/x86/av1_quantize_avx2.c
similarity index 100%
rename from third_party/aom/av1/encoder/x86/av1_quantize_avx2.c
rename to media/libaom/src/av1/encoder/x86/av1_quantize_avx2.c
diff --git a/third_party/aom/av1/encoder/x86/av1_quantize_sse2.c b/media/libaom/src/av1/encoder/x86/av1_quantize_sse2.c
similarity index 100%
rename from third_party/aom/av1/encoder/x86/av1_quantize_sse2.c
rename to media/libaom/src/av1/encoder/x86/av1_quantize_sse2.c
diff --git a/third_party/aom/av1/encoder/x86/av1_quantize_ssse3_x86_64.asm b/media/libaom/src/av1/encoder/x86/av1_quantize_ssse3_x86_64.asm
similarity index 100%
rename from third_party/aom/av1/encoder/x86/av1_quantize_ssse3_x86_64.asm
rename to media/libaom/src/av1/encoder/x86/av1_quantize_ssse3_x86_64.asm
diff --git a/third_party/aom/av1/encoder/x86/av1_ssim_opt_x86_64.asm b/media/libaom/src/av1/encoder/x86/av1_ssim_opt_x86_64.asm
similarity index 100%
rename from third_party/aom/av1/encoder/x86/av1_ssim_opt_x86_64.asm
rename to media/libaom/src/av1/encoder/x86/av1_ssim_opt_x86_64.asm
diff --git a/third_party/aom/av1/encoder/x86/av1_txfm1d_sse4.h b/media/libaom/src/av1/encoder/x86/av1_txfm1d_sse4.h
similarity index 100%
rename from third_party/aom/av1/encoder/x86/av1_txfm1d_sse4.h
rename to media/libaom/src/av1/encoder/x86/av1_txfm1d_sse4.h
diff --git a/third_party/aom/av1/encoder/x86/corner_match_sse4.c b/media/libaom/src/av1/encoder/x86/corner_match_sse4.c
similarity index 100%
rename from third_party/aom/av1/encoder/x86/corner_match_sse4.c
rename to media/libaom/src/av1/encoder/x86/corner_match_sse4.c
diff --git a/third_party/aom/av1/encoder/x86/dct_sse2.asm b/media/libaom/src/av1/encoder/x86/dct_sse2.asm
similarity index 100%
rename from third_party/aom/av1/encoder/x86/dct_sse2.asm
rename to media/libaom/src/av1/encoder/x86/dct_sse2.asm
diff --git a/third_party/aom/av1/encoder/x86/encodetxb_avx2.c b/media/libaom/src/av1/encoder/x86/encodetxb_avx2.c
similarity index 100%
rename from third_party/aom/av1/encoder/x86/encodetxb_avx2.c
rename to media/libaom/src/av1/encoder/x86/encodetxb_avx2.c
diff --git a/third_party/aom/av1/encoder/x86/encodetxb_sse2.c b/media/libaom/src/av1/encoder/x86/encodetxb_sse2.c
similarity index 100%
rename from third_party/aom/av1/encoder/x86/encodetxb_sse2.c
rename to media/libaom/src/av1/encoder/x86/encodetxb_sse2.c
diff --git a/third_party/aom/av1/encoder/x86/encodetxb_sse4.c b/media/libaom/src/av1/encoder/x86/encodetxb_sse4.c
similarity index 100%
rename from third_party/aom/av1/encoder/x86/encodetxb_sse4.c
rename to media/libaom/src/av1/encoder/x86/encodetxb_sse4.c
diff --git a/third_party/aom/av1/encoder/x86/error_intrin_avx2.c b/media/libaom/src/av1/encoder/x86/error_intrin_avx2.c
similarity index 100%
rename from third_party/aom/av1/encoder/x86/error_intrin_avx2.c
rename to media/libaom/src/av1/encoder/x86/error_intrin_avx2.c
diff --git a/third_party/aom/av1/encoder/x86/error_sse2.asm b/media/libaom/src/av1/encoder/x86/error_sse2.asm
similarity index 100%
rename from third_party/aom/av1/encoder/x86/error_sse2.asm
rename to media/libaom/src/av1/encoder/x86/error_sse2.asm
diff --git a/third_party/aom/av1/encoder/x86/hash_sse42.c b/media/libaom/src/av1/encoder/x86/hash_sse42.c
similarity index 100%
rename from third_party/aom/av1/encoder/x86/hash_sse42.c
rename to media/libaom/src/av1/encoder/x86/hash_sse42.c
diff --git a/third_party/aom/av1/encoder/x86/highbd_block_error_intrin_sse2.c b/media/libaom/src/av1/encoder/x86/highbd_block_error_intrin_sse2.c
similarity index 100%
rename from third_party/aom/av1/encoder/x86/highbd_block_error_intrin_sse2.c
rename to media/libaom/src/av1/encoder/x86/highbd_block_error_intrin_sse2.c
diff --git a/third_party/aom/av1/encoder/x86/highbd_fwd_txfm_sse4.c b/media/libaom/src/av1/encoder/x86/highbd_fwd_txfm_sse4.c
similarity index 100%
rename from third_party/aom/av1/encoder/x86/highbd_fwd_txfm_sse4.c
rename to media/libaom/src/av1/encoder/x86/highbd_fwd_txfm_sse4.c
diff --git a/third_party/aom/av1/encoder/x86/pickrst_avx2.c b/media/libaom/src/av1/encoder/x86/pickrst_avx2.c
similarity index 100%
rename from third_party/aom/av1/encoder/x86/pickrst_avx2.c
rename to media/libaom/src/av1/encoder/x86/pickrst_avx2.c
diff --git a/third_party/aom/av1/encoder/x86/pickrst_sse4.c b/media/libaom/src/av1/encoder/x86/pickrst_sse4.c
similarity index 100%
rename from third_party/aom/av1/encoder/x86/pickrst_sse4.c
rename to media/libaom/src/av1/encoder/x86/pickrst_sse4.c
diff --git a/third_party/aom/av1/encoder/x86/temporal_filter_apply_sse2.asm b/media/libaom/src/av1/encoder/x86/temporal_filter_apply_sse2.asm
similarity index 100%
rename from third_party/aom/av1/encoder/x86/temporal_filter_apply_sse2.asm
rename to media/libaom/src/av1/encoder/x86/temporal_filter_apply_sse2.asm
diff --git a/third_party/aom/av1/encoder/x86/wedge_utils_avx2.c b/media/libaom/src/av1/encoder/x86/wedge_utils_avx2.c
similarity index 100%
rename from third_party/aom/av1/encoder/x86/wedge_utils_avx2.c
rename to media/libaom/src/av1/encoder/x86/wedge_utils_avx2.c
diff --git a/third_party/aom/av1/encoder/x86/wedge_utils_sse2.c b/media/libaom/src/av1/encoder/x86/wedge_utils_sse2.c
similarity index 100%
rename from third_party/aom/av1/encoder/x86/wedge_utils_sse2.c
rename to media/libaom/src/av1/encoder/x86/wedge_utils_sse2.c
diff --git a/third_party/aom/av1/exports_com b/media/libaom/src/av1/exports_com
similarity index 100%
rename from third_party/aom/av1/exports_com
rename to media/libaom/src/av1/exports_com
diff --git a/third_party/aom/av1/exports_dec b/media/libaom/src/av1/exports_dec
similarity index 100%
rename from third_party/aom/av1/exports_dec
rename to media/libaom/src/av1/exports_dec
diff --git a/third_party/aom/av1/exports_enc b/media/libaom/src/av1/exports_enc
similarity index 100%
rename from third_party/aom/av1/exports_enc
rename to media/libaom/src/av1/exports_enc
diff --git a/third_party/aom/av1/exports_test b/media/libaom/src/av1/exports_test
similarity index 100%
rename from third_party/aom/av1/exports_test
rename to media/libaom/src/av1/exports_test
diff --git a/third_party/aom/build/cmake/aom_config.c.template b/media/libaom/src/build/cmake/aom_config.c.template
similarity index 100%
rename from third_party/aom/build/cmake/aom_config.c.template
rename to media/libaom/src/build/cmake/aom_config.c.template
diff --git a/third_party/aom/build/cmake/aom_config_defaults.cmake b/media/libaom/src/build/cmake/aom_config_defaults.cmake
similarity index 100%
rename from third_party/aom/build/cmake/aom_config_defaults.cmake
rename to media/libaom/src/build/cmake/aom_config_defaults.cmake
diff --git a/third_party/aom/build/cmake/aom_configure.cmake b/media/libaom/src/build/cmake/aom_configure.cmake
similarity index 100%
rename from third_party/aom/build/cmake/aom_configure.cmake
rename to media/libaom/src/build/cmake/aom_configure.cmake
diff --git a/third_party/aom/build/cmake/aom_experiment_deps.cmake b/media/libaom/src/build/cmake/aom_experiment_deps.cmake
similarity index 100%
rename from third_party/aom/build/cmake/aom_experiment_deps.cmake
rename to media/libaom/src/build/cmake/aom_experiment_deps.cmake
diff --git a/third_party/aom/build/cmake/aom_optimization.cmake b/media/libaom/src/build/cmake/aom_optimization.cmake
similarity index 100%
rename from third_party/aom/build/cmake/aom_optimization.cmake
rename to media/libaom/src/build/cmake/aom_optimization.cmake
diff --git a/third_party/aom/build/cmake/compiler_flags.cmake b/media/libaom/src/build/cmake/compiler_flags.cmake
similarity index 100%
rename from third_party/aom/build/cmake/compiler_flags.cmake
rename to media/libaom/src/build/cmake/compiler_flags.cmake
diff --git a/third_party/aom/build/cmake/compiler_tests.cmake b/media/libaom/src/build/cmake/compiler_tests.cmake
similarity index 100%
rename from third_party/aom/build/cmake/compiler_tests.cmake
rename to media/libaom/src/build/cmake/compiler_tests.cmake
diff --git a/third_party/aom/build/cmake/cpu.cmake b/media/libaom/src/build/cmake/cpu.cmake
similarity index 100%
rename from third_party/aom/build/cmake/cpu.cmake
rename to media/libaom/src/build/cmake/cpu.cmake
diff --git a/third_party/aom/build/cmake/dist.cmake b/media/libaom/src/build/cmake/dist.cmake
similarity index 100%
rename from third_party/aom/build/cmake/dist.cmake
rename to media/libaom/src/build/cmake/dist.cmake
diff --git a/third_party/aom/build/cmake/exports.cmake b/media/libaom/src/build/cmake/exports.cmake
similarity index 100%
rename from third_party/aom/build/cmake/exports.cmake
rename to media/libaom/src/build/cmake/exports.cmake
diff --git a/third_party/aom/build/cmake/exports_sources.cmake b/media/libaom/src/build/cmake/exports_sources.cmake
similarity index 100%
rename from third_party/aom/build/cmake/exports_sources.cmake
rename to media/libaom/src/build/cmake/exports_sources.cmake
diff --git a/third_party/aom/build/cmake/generate_aom_config_templates.cmake b/media/libaom/src/build/cmake/generate_aom_config_templates.cmake
similarity index 100%
rename from third_party/aom/build/cmake/generate_aom_config_templates.cmake
rename to media/libaom/src/build/cmake/generate_aom_config_templates.cmake
diff --git a/third_party/aom/build/cmake/generate_exports.cmake b/media/libaom/src/build/cmake/generate_exports.cmake
similarity index 100%
rename from third_party/aom/build/cmake/generate_exports.cmake
rename to media/libaom/src/build/cmake/generate_exports.cmake
diff --git a/third_party/aom/build/cmake/ios-Info.plist b/media/libaom/src/build/cmake/ios-Info.plist
similarity index 100%
rename from third_party/aom/build/cmake/ios-Info.plist
rename to media/libaom/src/build/cmake/ios-Info.plist
diff --git a/third_party/aom/build/cmake/iosbuild.sh b/media/libaom/src/build/cmake/iosbuild.sh
similarity index 100%
rename from third_party/aom/build/cmake/iosbuild.sh
rename to media/libaom/src/build/cmake/iosbuild.sh
diff --git a/third_party/aom/build/cmake/msvc_runtime.cmake b/media/libaom/src/build/cmake/msvc_runtime.cmake
similarity index 100%
rename from third_party/aom/build/cmake/msvc_runtime.cmake
rename to media/libaom/src/build/cmake/msvc_runtime.cmake
diff --git a/third_party/aom/build/cmake/pkg_config.cmake b/media/libaom/src/build/cmake/pkg_config.cmake
similarity index 100%
rename from third_party/aom/build/cmake/pkg_config.cmake
rename to media/libaom/src/build/cmake/pkg_config.cmake
diff --git a/third_party/aom/build/cmake/rtcd.pl b/media/libaom/src/build/cmake/rtcd.pl
similarity index 100%
rename from third_party/aom/build/cmake/rtcd.pl
rename to media/libaom/src/build/cmake/rtcd.pl
diff --git a/third_party/aom/build/cmake/sanitizers.cmake b/media/libaom/src/build/cmake/sanitizers.cmake
similarity index 100%
rename from third_party/aom/build/cmake/sanitizers.cmake
rename to media/libaom/src/build/cmake/sanitizers.cmake
diff --git a/third_party/aom/build/cmake/toolchains/arm-ios-common.cmake b/media/libaom/src/build/cmake/toolchains/arm-ios-common.cmake
similarity index 100%
rename from third_party/aom/build/cmake/toolchains/arm-ios-common.cmake
rename to media/libaom/src/build/cmake/toolchains/arm-ios-common.cmake
diff --git a/third_party/aom/build/cmake/toolchains/arm64-ios.cmake b/media/libaom/src/build/cmake/toolchains/arm64-ios.cmake
similarity index 100%
rename from third_party/aom/build/cmake/toolchains/arm64-ios.cmake
rename to media/libaom/src/build/cmake/toolchains/arm64-ios.cmake
diff --git a/third_party/aom/build/cmake/toolchains/arm64-linux-gcc.cmake b/media/libaom/src/build/cmake/toolchains/arm64-linux-gcc.cmake
similarity index 100%
rename from third_party/aom/build/cmake/toolchains/arm64-linux-gcc.cmake
rename to media/libaom/src/build/cmake/toolchains/arm64-linux-gcc.cmake
diff --git a/third_party/aom/build/cmake/toolchains/arm64-mingw-gcc.cmake b/media/libaom/src/build/cmake/toolchains/arm64-mingw-gcc.cmake
similarity index 100%
rename from third_party/aom/build/cmake/toolchains/arm64-mingw-gcc.cmake
rename to media/libaom/src/build/cmake/toolchains/arm64-mingw-gcc.cmake
diff --git a/third_party/aom/build/cmake/toolchains/armv7-ios.cmake b/media/libaom/src/build/cmake/toolchains/armv7-ios.cmake
similarity index 100%
rename from third_party/aom/build/cmake/toolchains/armv7-ios.cmake
rename to media/libaom/src/build/cmake/toolchains/armv7-ios.cmake
diff --git a/third_party/aom/build/cmake/toolchains/armv7-linux-gcc.cmake b/media/libaom/src/build/cmake/toolchains/armv7-linux-gcc.cmake
similarity index 100%
rename from third_party/aom/build/cmake/toolchains/armv7-linux-gcc.cmake
rename to media/libaom/src/build/cmake/toolchains/armv7-linux-gcc.cmake
diff --git a/third_party/aom/build/cmake/toolchains/armv7-mingw-gcc.cmake b/media/libaom/src/build/cmake/toolchains/armv7-mingw-gcc.cmake
similarity index 100%
rename from third_party/aom/build/cmake/toolchains/armv7-mingw-gcc.cmake
rename to media/libaom/src/build/cmake/toolchains/armv7-mingw-gcc.cmake
diff --git a/third_party/aom/build/cmake/toolchains/armv7s-ios.cmake b/media/libaom/src/build/cmake/toolchains/armv7s-ios.cmake
similarity index 100%
rename from third_party/aom/build/cmake/toolchains/armv7s-ios.cmake
rename to media/libaom/src/build/cmake/toolchains/armv7s-ios.cmake
diff --git a/third_party/aom/build/cmake/toolchains/ios-simulator-common.cmake b/media/libaom/src/build/cmake/toolchains/ios-simulator-common.cmake
similarity index 100%
rename from third_party/aom/build/cmake/toolchains/ios-simulator-common.cmake
rename to media/libaom/src/build/cmake/toolchains/ios-simulator-common.cmake
diff --git a/third_party/aom/build/cmake/toolchains/mips32-linux-gcc.cmake b/media/libaom/src/build/cmake/toolchains/mips32-linux-gcc.cmake
similarity index 100%
rename from third_party/aom/build/cmake/toolchains/mips32-linux-gcc.cmake
rename to media/libaom/src/build/cmake/toolchains/mips32-linux-gcc.cmake
diff --git a/third_party/aom/build/cmake/toolchains/mips64-linux-gcc.cmake b/media/libaom/src/build/cmake/toolchains/mips64-linux-gcc.cmake
similarity index 100%
rename from third_party/aom/build/cmake/toolchains/mips64-linux-gcc.cmake
rename to media/libaom/src/build/cmake/toolchains/mips64-linux-gcc.cmake
diff --git a/third_party/aom/build/cmake/toolchains/ppc-linux-gcc.cmake b/media/libaom/src/build/cmake/toolchains/ppc-linux-gcc.cmake
similarity index 100%
rename from third_party/aom/build/cmake/toolchains/ppc-linux-gcc.cmake
rename to media/libaom/src/build/cmake/toolchains/ppc-linux-gcc.cmake
diff --git a/third_party/aom/build/cmake/toolchains/x86-ios-simulator.cmake b/media/libaom/src/build/cmake/toolchains/x86-ios-simulator.cmake
similarity index 100%
rename from third_party/aom/build/cmake/toolchains/x86-ios-simulator.cmake
rename to media/libaom/src/build/cmake/toolchains/x86-ios-simulator.cmake
diff --git a/third_party/aom/build/cmake/toolchains/x86-linux.cmake b/media/libaom/src/build/cmake/toolchains/x86-linux.cmake
similarity index 100%
rename from third_party/aom/build/cmake/toolchains/x86-linux.cmake
rename to media/libaom/src/build/cmake/toolchains/x86-linux.cmake
diff --git a/third_party/aom/build/cmake/toolchains/x86-macos.cmake b/media/libaom/src/build/cmake/toolchains/x86-macos.cmake
similarity index 100%
rename from third_party/aom/build/cmake/toolchains/x86-macos.cmake
rename to media/libaom/src/build/cmake/toolchains/x86-macos.cmake
diff --git a/third_party/aom/build/cmake/toolchains/x86-mingw-gcc.cmake b/media/libaom/src/build/cmake/toolchains/x86-mingw-gcc.cmake
similarity index 100%
rename from third_party/aom/build/cmake/toolchains/x86-mingw-gcc.cmake
rename to media/libaom/src/build/cmake/toolchains/x86-mingw-gcc.cmake
diff --git a/third_party/aom/build/cmake/toolchains/x86_64-ios-simulator.cmake b/media/libaom/src/build/cmake/toolchains/x86_64-ios-simulator.cmake
similarity index 100%
rename from third_party/aom/build/cmake/toolchains/x86_64-ios-simulator.cmake
rename to media/libaom/src/build/cmake/toolchains/x86_64-ios-simulator.cmake
diff --git a/third_party/aom/build/cmake/toolchains/x86_64-mingw-gcc.cmake b/media/libaom/src/build/cmake/toolchains/x86_64-mingw-gcc.cmake
similarity index 100%
rename from third_party/aom/build/cmake/toolchains/x86_64-mingw-gcc.cmake
rename to media/libaom/src/build/cmake/toolchains/x86_64-mingw-gcc.cmake
diff --git a/third_party/aom/build/cmake/util.cmake b/media/libaom/src/build/cmake/util.cmake
similarity index 100%
rename from third_party/aom/build/cmake/util.cmake
rename to media/libaom/src/build/cmake/util.cmake
diff --git a/third_party/aom/build/cmake/version.cmake b/media/libaom/src/build/cmake/version.cmake
similarity index 100%
rename from third_party/aom/build/cmake/version.cmake
rename to media/libaom/src/build/cmake/version.cmake
diff --git a/third_party/aom/build/cmake/version.pl b/media/libaom/src/build/cmake/version.pl
similarity index 100%
rename from third_party/aom/build/cmake/version.pl
rename to media/libaom/src/build/cmake/version.pl
diff --git a/third_party/aom/codereview.settings b/media/libaom/src/codereview.settings
similarity index 100%
rename from third_party/aom/codereview.settings
rename to media/libaom/src/codereview.settings
diff --git a/third_party/aom/common/args.c b/media/libaom/src/common/args.c
similarity index 100%
rename from third_party/aom/common/args.c
rename to media/libaom/src/common/args.c
diff --git a/third_party/aom/common/args.h b/media/libaom/src/common/args.h
similarity index 100%
rename from third_party/aom/common/args.h
rename to media/libaom/src/common/args.h
diff --git a/third_party/aom/common/av1_config.c b/media/libaom/src/common/av1_config.c
similarity index 100%
rename from third_party/aom/common/av1_config.c
rename to media/libaom/src/common/av1_config.c
diff --git a/third_party/aom/common/av1_config.h b/media/libaom/src/common/av1_config.h
similarity index 100%
rename from third_party/aom/common/av1_config.h
rename to media/libaom/src/common/av1_config.h
diff --git a/third_party/aom/common/ivfdec.c b/media/libaom/src/common/ivfdec.c
similarity index 100%
rename from third_party/aom/common/ivfdec.c
rename to media/libaom/src/common/ivfdec.c
diff --git a/third_party/aom/common/ivfdec.h b/media/libaom/src/common/ivfdec.h
similarity index 100%
rename from third_party/aom/common/ivfdec.h
rename to media/libaom/src/common/ivfdec.h
diff --git a/third_party/aom/common/ivfenc.c b/media/libaom/src/common/ivfenc.c
similarity index 100%
rename from third_party/aom/common/ivfenc.c
rename to media/libaom/src/common/ivfenc.c
diff --git a/third_party/aom/common/ivfenc.h b/media/libaom/src/common/ivfenc.h
similarity index 100%
rename from third_party/aom/common/ivfenc.h
rename to media/libaom/src/common/ivfenc.h
diff --git a/third_party/aom/common/md5_utils.c b/media/libaom/src/common/md5_utils.c
similarity index 100%
rename from third_party/aom/common/md5_utils.c
rename to media/libaom/src/common/md5_utils.c
diff --git a/third_party/aom/common/md5_utils.h b/media/libaom/src/common/md5_utils.h
similarity index 100%
rename from third_party/aom/common/md5_utils.h
rename to media/libaom/src/common/md5_utils.h
diff --git a/third_party/aom/common/obudec.c b/media/libaom/src/common/obudec.c
similarity index 100%
rename from third_party/aom/common/obudec.c
rename to media/libaom/src/common/obudec.c
diff --git a/third_party/aom/common/obudec.h b/media/libaom/src/common/obudec.h
similarity index 100%
rename from third_party/aom/common/obudec.h
rename to media/libaom/src/common/obudec.h
diff --git a/third_party/aom/common/rawenc.c b/media/libaom/src/common/rawenc.c
similarity index 100%
rename from third_party/aom/common/rawenc.c
rename to media/libaom/src/common/rawenc.c
diff --git a/third_party/aom/common/rawenc.h b/media/libaom/src/common/rawenc.h
similarity index 100%
rename from third_party/aom/common/rawenc.h
rename to media/libaom/src/common/rawenc.h
diff --git a/third_party/aom/common/tools_common.c b/media/libaom/src/common/tools_common.c
similarity index 100%
rename from third_party/aom/common/tools_common.c
rename to media/libaom/src/common/tools_common.c
diff --git a/third_party/aom/common/tools_common.h b/media/libaom/src/common/tools_common.h
similarity index 100%
rename from third_party/aom/common/tools_common.h
rename to media/libaom/src/common/tools_common.h
diff --git a/third_party/aom/common/video_common.h b/media/libaom/src/common/video_common.h
similarity index 100%
rename from third_party/aom/common/video_common.h
rename to media/libaom/src/common/video_common.h
diff --git a/third_party/aom/common/video_reader.c b/media/libaom/src/common/video_reader.c
similarity index 100%
rename from third_party/aom/common/video_reader.c
rename to media/libaom/src/common/video_reader.c
diff --git a/third_party/aom/common/video_reader.h b/media/libaom/src/common/video_reader.h
similarity index 100%
rename from third_party/aom/common/video_reader.h
rename to media/libaom/src/common/video_reader.h
diff --git a/third_party/aom/common/video_writer.c b/media/libaom/src/common/video_writer.c
similarity index 100%
rename from third_party/aom/common/video_writer.c
rename to media/libaom/src/common/video_writer.c
diff --git a/third_party/aom/common/video_writer.h b/media/libaom/src/common/video_writer.h
similarity index 100%
rename from third_party/aom/common/video_writer.h
rename to media/libaom/src/common/video_writer.h
diff --git a/third_party/aom/common/warnings.c b/media/libaom/src/common/warnings.c
similarity index 100%
rename from third_party/aom/common/warnings.c
rename to media/libaom/src/common/warnings.c
diff --git a/third_party/aom/common/warnings.h b/media/libaom/src/common/warnings.h
similarity index 100%
rename from third_party/aom/common/warnings.h
rename to media/libaom/src/common/warnings.h
diff --git a/third_party/aom/common/webmdec.cc b/media/libaom/src/common/webmdec.cc
similarity index 100%
rename from third_party/aom/common/webmdec.cc
rename to media/libaom/src/common/webmdec.cc
diff --git a/third_party/aom/common/webmdec.h b/media/libaom/src/common/webmdec.h
similarity index 100%
rename from third_party/aom/common/webmdec.h
rename to media/libaom/src/common/webmdec.h
diff --git a/third_party/aom/common/webmenc.cc b/media/libaom/src/common/webmenc.cc
similarity index 100%
rename from third_party/aom/common/webmenc.cc
rename to media/libaom/src/common/webmenc.cc
diff --git a/third_party/aom/common/webmenc.h b/media/libaom/src/common/webmenc.h
similarity index 100%
rename from third_party/aom/common/webmenc.h
rename to media/libaom/src/common/webmenc.h
diff --git a/third_party/aom/common/y4menc.c b/media/libaom/src/common/y4menc.c
similarity index 100%
rename from third_party/aom/common/y4menc.c
rename to media/libaom/src/common/y4menc.c
diff --git a/third_party/aom/common/y4menc.h b/media/libaom/src/common/y4menc.h
similarity index 100%
rename from third_party/aom/common/y4menc.h
rename to media/libaom/src/common/y4menc.h
diff --git a/third_party/aom/common/y4minput.c b/media/libaom/src/common/y4minput.c
similarity index 100%
rename from third_party/aom/common/y4minput.c
rename to media/libaom/src/common/y4minput.c
diff --git a/third_party/aom/common/y4minput.h b/media/libaom/src/common/y4minput.h
similarity index 100%
rename from third_party/aom/common/y4minput.h
rename to media/libaom/src/common/y4minput.h
diff --git a/third_party/aom/docs.cmake b/media/libaom/src/docs.cmake
similarity index 100%
rename from third_party/aom/docs.cmake
rename to media/libaom/src/docs.cmake
diff --git a/third_party/aom/examples/analyzer.cc b/media/libaom/src/examples/analyzer.cc
similarity index 100%
rename from third_party/aom/examples/analyzer.cc
rename to media/libaom/src/examples/analyzer.cc
diff --git a/third_party/aom/examples/aom_cx_set_ref.c b/media/libaom/src/examples/aom_cx_set_ref.c
similarity index 100%
rename from third_party/aom/examples/aom_cx_set_ref.c
rename to media/libaom/src/examples/aom_cx_set_ref.c
diff --git a/third_party/aom/examples/decode_to_md5.c b/media/libaom/src/examples/decode_to_md5.c
similarity index 100%
rename from third_party/aom/examples/decode_to_md5.c
rename to media/libaom/src/examples/decode_to_md5.c
diff --git a/third_party/aom/examples/decode_with_drops.c b/media/libaom/src/examples/decode_with_drops.c
similarity index 100%
rename from third_party/aom/examples/decode_with_drops.c
rename to media/libaom/src/examples/decode_with_drops.c
diff --git a/third_party/aom/examples/encoder_util.c b/media/libaom/src/examples/encoder_util.c
similarity index 100%
rename from third_party/aom/examples/encoder_util.c
rename to media/libaom/src/examples/encoder_util.c
diff --git a/third_party/aom/examples/encoder_util.h b/media/libaom/src/examples/encoder_util.h
similarity index 100%
rename from third_party/aom/examples/encoder_util.h
rename to media/libaom/src/examples/encoder_util.h
diff --git a/third_party/aom/examples/inspect.c b/media/libaom/src/examples/inspect.c
similarity index 100%
rename from third_party/aom/examples/inspect.c
rename to media/libaom/src/examples/inspect.c
diff --git a/third_party/aom/examples/lightfield_bitstream_parsing.c b/media/libaom/src/examples/lightfield_bitstream_parsing.c
similarity index 100%
rename from third_party/aom/examples/lightfield_bitstream_parsing.c
rename to media/libaom/src/examples/lightfield_bitstream_parsing.c
diff --git a/third_party/aom/examples/lightfield_decoder.c b/media/libaom/src/examples/lightfield_decoder.c
similarity index 100%
rename from third_party/aom/examples/lightfield_decoder.c
rename to media/libaom/src/examples/lightfield_decoder.c
diff --git a/third_party/aom/examples/lightfield_encoder.c b/media/libaom/src/examples/lightfield_encoder.c
similarity index 100%
rename from third_party/aom/examples/lightfield_encoder.c
rename to media/libaom/src/examples/lightfield_encoder.c
diff --git a/third_party/aom/examples/lightfield_tile_list_decoder.c b/media/libaom/src/examples/lightfield_tile_list_decoder.c
similarity index 100%
rename from third_party/aom/examples/lightfield_tile_list_decoder.c
rename to media/libaom/src/examples/lightfield_tile_list_decoder.c
diff --git a/third_party/aom/examples/lossless_encoder.c b/media/libaom/src/examples/lossless_encoder.c
similarity index 100%
rename from third_party/aom/examples/lossless_encoder.c
rename to media/libaom/src/examples/lossless_encoder.c
diff --git a/third_party/aom/examples/noise_model.c b/media/libaom/src/examples/noise_model.c
similarity index 100%
rename from third_party/aom/examples/noise_model.c
rename to media/libaom/src/examples/noise_model.c
diff --git a/third_party/aom/examples/resize_util.c b/media/libaom/src/examples/resize_util.c
similarity index 100%
rename from third_party/aom/examples/resize_util.c
rename to media/libaom/src/examples/resize_util.c
diff --git a/third_party/aom/examples/scalable_decoder.c b/media/libaom/src/examples/scalable_decoder.c
similarity index 100%
rename from third_party/aom/examples/scalable_decoder.c
rename to media/libaom/src/examples/scalable_decoder.c
diff --git a/third_party/aom/examples/scalable_encoder.c b/media/libaom/src/examples/scalable_encoder.c
similarity index 100%
rename from third_party/aom/examples/scalable_encoder.c
rename to media/libaom/src/examples/scalable_encoder.c
diff --git a/third_party/aom/examples/set_maps.c b/media/libaom/src/examples/set_maps.c
similarity index 100%
rename from third_party/aom/examples/set_maps.c
rename to media/libaom/src/examples/set_maps.c
diff --git a/third_party/aom/examples/simple_decoder.c b/media/libaom/src/examples/simple_decoder.c
similarity index 100%
rename from third_party/aom/examples/simple_decoder.c
rename to media/libaom/src/examples/simple_decoder.c
diff --git a/third_party/aom/examples/simple_encoder.c b/media/libaom/src/examples/simple_encoder.c
similarity index 100%
rename from third_party/aom/examples/simple_encoder.c
rename to media/libaom/src/examples/simple_encoder.c
diff --git a/third_party/aom/examples/twopass_encoder.c b/media/libaom/src/examples/twopass_encoder.c
similarity index 100%
rename from third_party/aom/examples/twopass_encoder.c
rename to media/libaom/src/examples/twopass_encoder.c
diff --git a/third_party/aom/keywords.dox b/media/libaom/src/keywords.dox
similarity index 100%
rename from third_party/aom/keywords.dox
rename to media/libaom/src/keywords.dox
diff --git a/third_party/aom/libs.doxy_template b/media/libaom/src/libs.doxy_template
similarity index 100%
rename from third_party/aom/libs.doxy_template
rename to media/libaom/src/libs.doxy_template
diff --git a/third_party/aom/mainpage.dox b/media/libaom/src/mainpage.dox
similarity index 100%
rename from third_party/aom/mainpage.dox
rename to media/libaom/src/mainpage.dox
diff --git a/third_party/aom/stats/aomstats.c b/media/libaom/src/stats/aomstats.c
similarity index 100%
rename from third_party/aom/stats/aomstats.c
rename to media/libaom/src/stats/aomstats.c
diff --git a/third_party/aom/stats/aomstats.h b/media/libaom/src/stats/aomstats.h
similarity index 100%
rename from third_party/aom/stats/aomstats.h
rename to media/libaom/src/stats/aomstats.h
diff --git a/third_party/aom/stats/rate_hist.c b/media/libaom/src/stats/rate_hist.c
similarity index 100%
rename from third_party/aom/stats/rate_hist.c
rename to media/libaom/src/stats/rate_hist.c
diff --git a/third_party/aom/stats/rate_hist.h b/media/libaom/src/stats/rate_hist.h
similarity index 100%
rename from third_party/aom/stats/rate_hist.h
rename to media/libaom/src/stats/rate_hist.h
diff --git a/third_party/aom/test/accounting_test.cc b/media/libaom/src/test/accounting_test.cc
similarity index 100%
rename from third_party/aom/test/accounting_test.cc
rename to media/libaom/src/test/accounting_test.cc
diff --git a/third_party/aom/test/acm_random.h b/media/libaom/src/test/acm_random.h
similarity index 100%
rename from third_party/aom/test/acm_random.h
rename to media/libaom/src/test/acm_random.h
diff --git a/third_party/aom/test/active_map_test.cc b/media/libaom/src/test/active_map_test.cc
similarity index 100%
rename from third_party/aom/test/active_map_test.cc
rename to media/libaom/src/test/active_map_test.cc
diff --git a/third_party/aom/test/altref_test.cc b/media/libaom/src/test/altref_test.cc
similarity index 100%
rename from third_party/aom/test/altref_test.cc
rename to media/libaom/src/test/altref_test.cc
diff --git a/third_party/aom/test/aom_integer_test.cc b/media/libaom/src/test/aom_integer_test.cc
similarity index 100%
rename from third_party/aom/test/aom_integer_test.cc
rename to media/libaom/src/test/aom_integer_test.cc
diff --git a/third_party/aom/test/aomcx_set_ref.sh b/media/libaom/src/test/aomcx_set_ref.sh
similarity index 100%
rename from third_party/aom/test/aomcx_set_ref.sh
rename to media/libaom/src/test/aomcx_set_ref.sh
diff --git a/third_party/aom/test/aomdec.sh b/media/libaom/src/test/aomdec.sh
similarity index 100%
rename from third_party/aom/test/aomdec.sh
rename to media/libaom/src/test/aomdec.sh
diff --git a/third_party/aom/test/aomenc.sh b/media/libaom/src/test/aomenc.sh
similarity index 100%
rename from third_party/aom/test/aomenc.sh
rename to media/libaom/src/test/aomenc.sh
diff --git a/third_party/aom/test/aq_segment_test.cc b/media/libaom/src/test/aq_segment_test.cc
similarity index 100%
rename from third_party/aom/test/aq_segment_test.cc
rename to media/libaom/src/test/aq_segment_test.cc
diff --git a/third_party/aom/test/arf_freq_test.cc b/media/libaom/src/test/arf_freq_test.cc
similarity index 100%
rename from third_party/aom/test/arf_freq_test.cc
rename to media/libaom/src/test/arf_freq_test.cc
diff --git a/third_party/aom/test/av1_config_test.cc b/media/libaom/src/test/av1_config_test.cc
similarity index 100%
rename from third_party/aom/test/av1_config_test.cc
rename to media/libaom/src/test/av1_config_test.cc
diff --git a/third_party/aom/test/av1_convolve_2d_test.cc b/media/libaom/src/test/av1_convolve_2d_test.cc
similarity index 100%
rename from third_party/aom/test/av1_convolve_2d_test.cc
rename to media/libaom/src/test/av1_convolve_2d_test.cc
diff --git a/third_party/aom/test/av1_convolve_2d_test_util.cc b/media/libaom/src/test/av1_convolve_2d_test_util.cc
similarity index 100%
rename from third_party/aom/test/av1_convolve_2d_test_util.cc
rename to media/libaom/src/test/av1_convolve_2d_test_util.cc
diff --git a/third_party/aom/test/av1_convolve_2d_test_util.h b/media/libaom/src/test/av1_convolve_2d_test_util.h
similarity index 100%
rename from third_party/aom/test/av1_convolve_2d_test_util.h
rename to media/libaom/src/test/av1_convolve_2d_test_util.h
diff --git a/third_party/aom/test/av1_convolve_scale_test.cc b/media/libaom/src/test/av1_convolve_scale_test.cc
similarity index 100%
rename from third_party/aom/test/av1_convolve_scale_test.cc
rename to media/libaom/src/test/av1_convolve_scale_test.cc
diff --git a/third_party/aom/test/av1_encoder_parms_get_to_decoder.cc b/media/libaom/src/test/av1_encoder_parms_get_to_decoder.cc
similarity index 100%
rename from third_party/aom/test/av1_encoder_parms_get_to_decoder.cc
rename to media/libaom/src/test/av1_encoder_parms_get_to_decoder.cc
diff --git a/third_party/aom/test/av1_ext_tile_test.cc b/media/libaom/src/test/av1_ext_tile_test.cc
similarity index 100%
rename from third_party/aom/test/av1_ext_tile_test.cc
rename to media/libaom/src/test/av1_ext_tile_test.cc
diff --git a/third_party/aom/test/av1_fwd_txfm1d_test.cc b/media/libaom/src/test/av1_fwd_txfm1d_test.cc
similarity index 100%
rename from third_party/aom/test/av1_fwd_txfm1d_test.cc
rename to media/libaom/src/test/av1_fwd_txfm1d_test.cc
diff --git a/third_party/aom/test/av1_fwd_txfm2d_test.cc b/media/libaom/src/test/av1_fwd_txfm2d_test.cc
similarity index 100%
rename from third_party/aom/test/av1_fwd_txfm2d_test.cc
rename to media/libaom/src/test/av1_fwd_txfm2d_test.cc
diff --git a/third_party/aom/test/av1_highbd_iht_test.cc b/media/libaom/src/test/av1_highbd_iht_test.cc
similarity index 100%
rename from third_party/aom/test/av1_highbd_iht_test.cc
rename to media/libaom/src/test/av1_highbd_iht_test.cc
diff --git a/third_party/aom/test/av1_horz_only_frame_superres_test.cc b/media/libaom/src/test/av1_horz_only_frame_superres_test.cc
similarity index 100%
rename from third_party/aom/test/av1_horz_only_frame_superres_test.cc
rename to media/libaom/src/test/av1_horz_only_frame_superres_test.cc
diff --git a/third_party/aom/test/av1_inv_txfm1d_test.cc b/media/libaom/src/test/av1_inv_txfm1d_test.cc
similarity index 100%
rename from third_party/aom/test/av1_inv_txfm1d_test.cc
rename to media/libaom/src/test/av1_inv_txfm1d_test.cc
diff --git a/third_party/aom/test/av1_inv_txfm2d_test.cc b/media/libaom/src/test/av1_inv_txfm2d_test.cc
similarity index 100%
rename from third_party/aom/test/av1_inv_txfm2d_test.cc
rename to media/libaom/src/test/av1_inv_txfm2d_test.cc
diff --git a/third_party/aom/test/av1_quantize_test.cc b/media/libaom/src/test/av1_quantize_test.cc
similarity index 100%
rename from third_party/aom/test/av1_quantize_test.cc
rename to media/libaom/src/test/av1_quantize_test.cc
diff --git a/third_party/aom/test/av1_round_shift_array_test.cc b/media/libaom/src/test/av1_round_shift_array_test.cc
similarity index 100%
rename from third_party/aom/test/av1_round_shift_array_test.cc
rename to media/libaom/src/test/av1_round_shift_array_test.cc
diff --git a/third_party/aom/test/av1_txfm_test.cc b/media/libaom/src/test/av1_txfm_test.cc
similarity index 100%
rename from third_party/aom/test/av1_txfm_test.cc
rename to media/libaom/src/test/av1_txfm_test.cc
diff --git a/third_party/aom/test/av1_txfm_test.h b/media/libaom/src/test/av1_txfm_test.h
similarity index 100%
rename from third_party/aom/test/av1_txfm_test.h
rename to media/libaom/src/test/av1_txfm_test.h
diff --git a/third_party/aom/test/av1_wedge_utils_test.cc b/media/libaom/src/test/av1_wedge_utils_test.cc
similarity index 100%
rename from third_party/aom/test/av1_wedge_utils_test.cc
rename to media/libaom/src/test/av1_wedge_utils_test.cc
diff --git a/third_party/aom/test/best_encode.sh b/media/libaom/src/test/best_encode.sh
similarity index 100%
rename from third_party/aom/test/best_encode.sh
rename to media/libaom/src/test/best_encode.sh
diff --git a/third_party/aom/test/binary_codes_test.cc b/media/libaom/src/test/binary_codes_test.cc
similarity index 100%
rename from third_party/aom/test/binary_codes_test.cc
rename to media/libaom/src/test/binary_codes_test.cc
diff --git a/third_party/aom/test/blend_a64_mask_1d_test.cc b/media/libaom/src/test/blend_a64_mask_1d_test.cc
similarity index 100%
rename from third_party/aom/test/blend_a64_mask_1d_test.cc
rename to media/libaom/src/test/blend_a64_mask_1d_test.cc
diff --git a/third_party/aom/test/blend_a64_mask_test.cc b/media/libaom/src/test/blend_a64_mask_test.cc
similarity index 100%
rename from third_party/aom/test/blend_a64_mask_test.cc
rename to media/libaom/src/test/blend_a64_mask_test.cc
diff --git a/third_party/aom/test/blockd_test.cc b/media/libaom/src/test/blockd_test.cc
similarity index 100%
rename from third_party/aom/test/blockd_test.cc
rename to media/libaom/src/test/blockd_test.cc
diff --git a/third_party/aom/test/boolcoder_test.cc b/media/libaom/src/test/boolcoder_test.cc
similarity index 100%
rename from third_party/aom/test/boolcoder_test.cc
rename to media/libaom/src/test/boolcoder_test.cc
diff --git a/third_party/aom/test/borders_test.cc b/media/libaom/src/test/borders_test.cc
similarity index 100%
rename from third_party/aom/test/borders_test.cc
rename to media/libaom/src/test/borders_test.cc
diff --git a/third_party/aom/test/cdef_test.cc b/media/libaom/src/test/cdef_test.cc
similarity index 100%
rename from third_party/aom/test/cdef_test.cc
rename to media/libaom/src/test/cdef_test.cc
diff --git a/third_party/aom/test/cfl_test.cc b/media/libaom/src/test/cfl_test.cc
similarity index 100%
rename from third_party/aom/test/cfl_test.cc
rename to media/libaom/src/test/cfl_test.cc
diff --git a/third_party/aom/test/clear_system_state.h b/media/libaom/src/test/clear_system_state.h
similarity index 100%
rename from third_party/aom/test/clear_system_state.h
rename to media/libaom/src/test/clear_system_state.h
diff --git a/third_party/aom/test/codec_factory.h b/media/libaom/src/test/codec_factory.h
similarity index 100%
rename from third_party/aom/test/codec_factory.h
rename to media/libaom/src/test/codec_factory.h
diff --git a/third_party/aom/test/coding_path_sync.cc b/media/libaom/src/test/coding_path_sync.cc
similarity index 100%
rename from third_party/aom/test/coding_path_sync.cc
rename to media/libaom/src/test/coding_path_sync.cc
diff --git a/third_party/aom/test/comp_avg_pred_test.cc b/media/libaom/src/test/comp_avg_pred_test.cc
similarity index 100%
rename from third_party/aom/test/comp_avg_pred_test.cc
rename to media/libaom/src/test/comp_avg_pred_test.cc
diff --git a/third_party/aom/test/comp_avg_pred_test.h b/media/libaom/src/test/comp_avg_pred_test.h
similarity index 100%
rename from third_party/aom/test/comp_avg_pred_test.h
rename to media/libaom/src/test/comp_avg_pred_test.h
diff --git a/third_party/aom/test/comp_mask_variance_test.cc b/media/libaom/src/test/comp_mask_variance_test.cc
similarity index 100%
rename from third_party/aom/test/comp_mask_variance_test.cc
rename to media/libaom/src/test/comp_mask_variance_test.cc
diff --git a/third_party/aom/test/convolve_round_test.cc b/media/libaom/src/test/convolve_round_test.cc
similarity index 100%
rename from third_party/aom/test/convolve_round_test.cc
rename to media/libaom/src/test/convolve_round_test.cc
diff --git a/third_party/aom/test/convolve_test.cc b/media/libaom/src/test/convolve_test.cc
similarity index 100%
rename from third_party/aom/test/convolve_test.cc
rename to media/libaom/src/test/convolve_test.cc
diff --git a/third_party/aom/test/corner_match_test.cc b/media/libaom/src/test/corner_match_test.cc
similarity index 100%
rename from third_party/aom/test/corner_match_test.cc
rename to media/libaom/src/test/corner_match_test.cc
diff --git a/third_party/aom/test/cpu_speed_test.cc b/media/libaom/src/test/cpu_speed_test.cc
similarity index 100%
rename from third_party/aom/test/cpu_speed_test.cc
rename to media/libaom/src/test/cpu_speed_test.cc
diff --git a/third_party/aom/test/datarate_test.cc b/media/libaom/src/test/datarate_test.cc
similarity index 100%
rename from third_party/aom/test/datarate_test.cc
rename to media/libaom/src/test/datarate_test.cc
diff --git a/third_party/aom/test/decode_api_test.cc b/media/libaom/src/test/decode_api_test.cc
similarity index 100%
rename from third_party/aom/test/decode_api_test.cc
rename to media/libaom/src/test/decode_api_test.cc
diff --git a/third_party/aom/test/decode_multithreaded_test.cc b/media/libaom/src/test/decode_multithreaded_test.cc
similarity index 100%
rename from third_party/aom/test/decode_multithreaded_test.cc
rename to media/libaom/src/test/decode_multithreaded_test.cc
diff --git a/third_party/aom/test/decode_perf_test.cc b/media/libaom/src/test/decode_perf_test.cc
similarity index 100%
rename from third_party/aom/test/decode_perf_test.cc
rename to media/libaom/src/test/decode_perf_test.cc
diff --git a/third_party/aom/test/decode_test_driver.cc b/media/libaom/src/test/decode_test_driver.cc
similarity index 100%
rename from third_party/aom/test/decode_test_driver.cc
rename to media/libaom/src/test/decode_test_driver.cc
diff --git a/third_party/aom/test/decode_test_driver.h b/media/libaom/src/test/decode_test_driver.h
similarity index 100%
rename from third_party/aom/test/decode_test_driver.h
rename to media/libaom/src/test/decode_test_driver.h
diff --git a/third_party/aom/test/decode_to_md5.sh b/media/libaom/src/test/decode_to_md5.sh
similarity index 100%
rename from third_party/aom/test/decode_to_md5.sh
rename to media/libaom/src/test/decode_to_md5.sh
diff --git a/third_party/aom/test/decode_with_drops.sh b/media/libaom/src/test/decode_with_drops.sh
similarity index 100%
rename from third_party/aom/test/decode_with_drops.sh
rename to media/libaom/src/test/decode_with_drops.sh
diff --git a/third_party/aom/test/divu_small_test.cc b/media/libaom/src/test/divu_small_test.cc
similarity index 100%
rename from third_party/aom/test/divu_small_test.cc
rename to media/libaom/src/test/divu_small_test.cc
diff --git a/third_party/aom/test/dr_prediction_test.cc b/media/libaom/src/test/dr_prediction_test.cc
similarity index 100%
rename from third_party/aom/test/dr_prediction_test.cc
rename to media/libaom/src/test/dr_prediction_test.cc
diff --git a/third_party/aom/test/dump_obu.sh b/media/libaom/src/test/dump_obu.sh
similarity index 100%
rename from third_party/aom/test/dump_obu.sh
rename to media/libaom/src/test/dump_obu.sh
diff --git a/third_party/aom/test/ec_test.cc b/media/libaom/src/test/ec_test.cc
similarity index 100%
rename from third_party/aom/test/ec_test.cc
rename to media/libaom/src/test/ec_test.cc
diff --git a/third_party/aom/test/encode_api_test.cc b/media/libaom/src/test/encode_api_test.cc
similarity index 100%
rename from third_party/aom/test/encode_api_test.cc
rename to media/libaom/src/test/encode_api_test.cc
diff --git a/third_party/aom/test/encode_perf_test.cc b/media/libaom/src/test/encode_perf_test.cc
similarity index 100%
rename from third_party/aom/test/encode_perf_test.cc
rename to media/libaom/src/test/encode_perf_test.cc
diff --git a/third_party/aom/test/encode_test_driver.cc b/media/libaom/src/test/encode_test_driver.cc
similarity index 100%
rename from third_party/aom/test/encode_test_driver.cc
rename to media/libaom/src/test/encode_test_driver.cc
diff --git a/third_party/aom/test/encode_test_driver.h b/media/libaom/src/test/encode_test_driver.h
similarity index 100%
rename from third_party/aom/test/encode_test_driver.h
rename to media/libaom/src/test/encode_test_driver.h
diff --git a/third_party/aom/test/encodetxb_test.cc b/media/libaom/src/test/encodetxb_test.cc
similarity index 100%
rename from third_party/aom/test/encodetxb_test.cc
rename to media/libaom/src/test/encodetxb_test.cc
diff --git a/third_party/aom/test/end_to_end_test.cc b/media/libaom/src/test/end_to_end_test.cc
similarity index 100%
rename from third_party/aom/test/end_to_end_test.cc
rename to media/libaom/src/test/end_to_end_test.cc
diff --git a/third_party/aom/test/error_block_test.cc b/media/libaom/src/test/error_block_test.cc
similarity index 100%
rename from third_party/aom/test/error_block_test.cc
rename to media/libaom/src/test/error_block_test.cc
diff --git a/third_party/aom/test/error_resilience_test.cc b/media/libaom/src/test/error_resilience_test.cc
similarity index 100%
rename from third_party/aom/test/error_resilience_test.cc
rename to media/libaom/src/test/error_resilience_test.cc
diff --git a/third_party/aom/test/ethread_test.cc b/media/libaom/src/test/ethread_test.cc
similarity index 100%
rename from third_party/aom/test/ethread_test.cc
rename to media/libaom/src/test/ethread_test.cc
diff --git a/third_party/aom/test/examples.sh b/media/libaom/src/test/examples.sh
similarity index 100%
rename from third_party/aom/test/examples.sh
rename to media/libaom/src/test/examples.sh
diff --git a/third_party/aom/test/external_frame_buffer_test.cc b/media/libaom/src/test/external_frame_buffer_test.cc
similarity index 100%
rename from third_party/aom/test/external_frame_buffer_test.cc
rename to media/libaom/src/test/external_frame_buffer_test.cc
diff --git a/third_party/aom/test/fft_test.cc b/media/libaom/src/test/fft_test.cc
similarity index 100%
rename from third_party/aom/test/fft_test.cc
rename to media/libaom/src/test/fft_test.cc
diff --git a/third_party/aom/test/film_grain_table_test.cc b/media/libaom/src/test/film_grain_table_test.cc
similarity index 100%
rename from third_party/aom/test/film_grain_table_test.cc
rename to media/libaom/src/test/film_grain_table_test.cc
diff --git a/third_party/aom/test/filterintra_test.cc b/media/libaom/src/test/filterintra_test.cc
similarity index 100%
rename from third_party/aom/test/filterintra_test.cc
rename to media/libaom/src/test/filterintra_test.cc
diff --git a/third_party/aom/test/frame_size_tests.cc b/media/libaom/src/test/frame_size_tests.cc
similarity index 100%
rename from third_party/aom/test/frame_size_tests.cc
rename to media/libaom/src/test/frame_size_tests.cc
diff --git a/third_party/aom/test/function_equivalence_test.h b/media/libaom/src/test/function_equivalence_test.h
similarity index 100%
rename from third_party/aom/test/function_equivalence_test.h
rename to media/libaom/src/test/function_equivalence_test.h
diff --git a/third_party/aom/test/fwht4x4_test.cc b/media/libaom/src/test/fwht4x4_test.cc
similarity index 100%
rename from third_party/aom/test/fwht4x4_test.cc
rename to media/libaom/src/test/fwht4x4_test.cc
diff --git a/third_party/aom/test/gviz_api.py b/media/libaom/src/test/gviz_api.py
similarity index 100%
rename from third_party/aom/test/gviz_api.py
rename to media/libaom/src/test/gviz_api.py
diff --git a/third_party/aom/test/hash_test.cc b/media/libaom/src/test/hash_test.cc
similarity index 100%
rename from third_party/aom/test/hash_test.cc
rename to media/libaom/src/test/hash_test.cc
diff --git a/third_party/aom/test/hbd_metrics_test.cc b/media/libaom/src/test/hbd_metrics_test.cc
similarity index 100%
rename from third_party/aom/test/hbd_metrics_test.cc
rename to media/libaom/src/test/hbd_metrics_test.cc
diff --git a/third_party/aom/test/hiprec_convolve_test.cc b/media/libaom/src/test/hiprec_convolve_test.cc
similarity index 100%
rename from third_party/aom/test/hiprec_convolve_test.cc
rename to media/libaom/src/test/hiprec_convolve_test.cc
diff --git a/third_party/aom/test/hiprec_convolve_test_util.cc b/media/libaom/src/test/hiprec_convolve_test_util.cc
similarity index 100%
rename from third_party/aom/test/hiprec_convolve_test_util.cc
rename to media/libaom/src/test/hiprec_convolve_test_util.cc
diff --git a/third_party/aom/test/hiprec_convolve_test_util.h b/media/libaom/src/test/hiprec_convolve_test_util.h
similarity index 100%
rename from third_party/aom/test/hiprec_convolve_test_util.h
rename to media/libaom/src/test/hiprec_convolve_test_util.h
diff --git a/third_party/aom/test/horz_superres_test.cc b/media/libaom/src/test/horz_superres_test.cc
similarity index 100%
rename from third_party/aom/test/horz_superres_test.cc
rename to media/libaom/src/test/horz_superres_test.cc
diff --git a/third_party/aom/test/i420_video_source.h b/media/libaom/src/test/i420_video_source.h
similarity index 100%
rename from third_party/aom/test/i420_video_source.h
rename to media/libaom/src/test/i420_video_source.h
diff --git a/third_party/aom/test/intra_edge_test.cc b/media/libaom/src/test/intra_edge_test.cc
similarity index 100%
rename from third_party/aom/test/intra_edge_test.cc
rename to media/libaom/src/test/intra_edge_test.cc
diff --git a/third_party/aom/test/intrabc_test.cc b/media/libaom/src/test/intrabc_test.cc
similarity index 100%
rename from third_party/aom/test/intrabc_test.cc
rename to media/libaom/src/test/intrabc_test.cc
diff --git a/third_party/aom/test/intrapred_test.cc b/media/libaom/src/test/intrapred_test.cc
similarity index 100%
rename from third_party/aom/test/intrapred_test.cc
rename to media/libaom/src/test/intrapred_test.cc
diff --git a/third_party/aom/test/invalid_file_test.cc b/media/libaom/src/test/invalid_file_test.cc
similarity index 100%
rename from third_party/aom/test/invalid_file_test.cc
rename to media/libaom/src/test/invalid_file_test.cc
diff --git a/third_party/aom/test/ivf_video_source.h b/media/libaom/src/test/ivf_video_source.h
similarity index 100%
rename from third_party/aom/test/ivf_video_source.h
rename to media/libaom/src/test/ivf_video_source.h
diff --git a/third_party/aom/test/lightfield_test.sh b/media/libaom/src/test/lightfield_test.sh
similarity index 100%
rename from third_party/aom/test/lightfield_test.sh
rename to media/libaom/src/test/lightfield_test.sh
diff --git a/third_party/aom/test/log2_test.cc b/media/libaom/src/test/log2_test.cc
similarity index 100%
rename from third_party/aom/test/log2_test.cc
rename to media/libaom/src/test/log2_test.cc
diff --git a/third_party/aom/test/lossless_test.cc b/media/libaom/src/test/lossless_test.cc
similarity index 100%
rename from third_party/aom/test/lossless_test.cc
rename to media/libaom/src/test/lossless_test.cc
diff --git a/third_party/aom/test/lpf_test.cc b/media/libaom/src/test/lpf_test.cc
similarity index 100%
rename from third_party/aom/test/lpf_test.cc
rename to media/libaom/src/test/lpf_test.cc
diff --git a/third_party/aom/test/masked_sad_test.cc b/media/libaom/src/test/masked_sad_test.cc
similarity index 100%
rename from third_party/aom/test/masked_sad_test.cc
rename to media/libaom/src/test/masked_sad_test.cc
diff --git a/third_party/aom/test/masked_variance_test.cc b/media/libaom/src/test/masked_variance_test.cc
similarity index 100%
rename from third_party/aom/test/masked_variance_test.cc
rename to media/libaom/src/test/masked_variance_test.cc
diff --git a/third_party/aom/test/md5_helper.h b/media/libaom/src/test/md5_helper.h
similarity index 100%
rename from third_party/aom/test/md5_helper.h
rename to media/libaom/src/test/md5_helper.h
diff --git a/third_party/aom/test/metrics_template.html b/media/libaom/src/test/metrics_template.html
similarity index 100%
rename from third_party/aom/test/metrics_template.html
rename to media/libaom/src/test/metrics_template.html
diff --git a/third_party/aom/test/monochrome_test.cc b/media/libaom/src/test/monochrome_test.cc
similarity index 100%
rename from third_party/aom/test/monochrome_test.cc
rename to media/libaom/src/test/monochrome_test.cc
diff --git a/third_party/aom/test/motion_vector_test.cc b/media/libaom/src/test/motion_vector_test.cc
similarity index 100%
rename from third_party/aom/test/motion_vector_test.cc
rename to media/libaom/src/test/motion_vector_test.cc
diff --git a/third_party/aom/test/noise_model_test.cc b/media/libaom/src/test/noise_model_test.cc
similarity index 100%
rename from third_party/aom/test/noise_model_test.cc
rename to media/libaom/src/test/noise_model_test.cc
diff --git a/third_party/aom/test/obmc_sad_test.cc b/media/libaom/src/test/obmc_sad_test.cc
similarity index 100%
rename from third_party/aom/test/obmc_sad_test.cc
rename to media/libaom/src/test/obmc_sad_test.cc
diff --git a/third_party/aom/test/obmc_variance_test.cc b/media/libaom/src/test/obmc_variance_test.cc
similarity index 100%
rename from third_party/aom/test/obmc_variance_test.cc
rename to media/libaom/src/test/obmc_variance_test.cc
diff --git a/third_party/aom/test/onyxc_int_test.cc b/media/libaom/src/test/onyxc_int_test.cc
similarity index 100%
rename from third_party/aom/test/onyxc_int_test.cc
rename to media/libaom/src/test/onyxc_int_test.cc
diff --git a/third_party/aom/test/pickrst_test.cc b/media/libaom/src/test/pickrst_test.cc
similarity index 100%
rename from third_party/aom/test/pickrst_test.cc
rename to media/libaom/src/test/pickrst_test.cc
diff --git a/third_party/aom/test/qm_test.cc b/media/libaom/src/test/qm_test.cc
similarity index 100%
rename from third_party/aom/test/qm_test.cc
rename to media/libaom/src/test/qm_test.cc
diff --git a/third_party/aom/test/quantize_func_test.cc b/media/libaom/src/test/quantize_func_test.cc
similarity index 100%
rename from third_party/aom/test/quantize_func_test.cc
rename to media/libaom/src/test/quantize_func_test.cc
diff --git a/third_party/aom/test/reconinter_test.cc b/media/libaom/src/test/reconinter_test.cc
similarity index 100%
rename from third_party/aom/test/reconinter_test.cc
rename to media/libaom/src/test/reconinter_test.cc
diff --git a/third_party/aom/test/register_state_check.h b/media/libaom/src/test/register_state_check.h
similarity index 100%
rename from third_party/aom/test/register_state_check.h
rename to media/libaom/src/test/register_state_check.h
diff --git a/third_party/aom/test/resize_test.cc b/media/libaom/src/test/resize_test.cc
similarity index 100%
rename from third_party/aom/test/resize_test.cc
rename to media/libaom/src/test/resize_test.cc
diff --git a/third_party/aom/test/run_encodes.sh b/media/libaom/src/test/run_encodes.sh
similarity index 100%
rename from third_party/aom/test/run_encodes.sh
rename to media/libaom/src/test/run_encodes.sh
diff --git a/third_party/aom/test/sad_test.cc b/media/libaom/src/test/sad_test.cc
similarity index 100%
rename from third_party/aom/test/sad_test.cc
rename to media/libaom/src/test/sad_test.cc
diff --git a/third_party/aom/test/scalability_test.cc b/media/libaom/src/test/scalability_test.cc
similarity index 100%
rename from third_party/aom/test/scalability_test.cc
rename to media/libaom/src/test/scalability_test.cc
diff --git a/third_party/aom/test/scan_test.cc b/media/libaom/src/test/scan_test.cc
similarity index 100%
rename from third_party/aom/test/scan_test.cc
rename to media/libaom/src/test/scan_test.cc
diff --git a/third_party/aom/test/segment_binarization_sync.cc b/media/libaom/src/test/segment_binarization_sync.cc
similarity index 100%
rename from third_party/aom/test/segment_binarization_sync.cc
rename to media/libaom/src/test/segment_binarization_sync.cc
diff --git a/third_party/aom/test/selfguided_filter_test.cc b/media/libaom/src/test/selfguided_filter_test.cc
similarity index 100%
rename from third_party/aom/test/selfguided_filter_test.cc
rename to media/libaom/src/test/selfguided_filter_test.cc
diff --git a/third_party/aom/test/set_maps.sh b/media/libaom/src/test/set_maps.sh
similarity index 100%
rename from third_party/aom/test/set_maps.sh
rename to media/libaom/src/test/set_maps.sh
diff --git a/third_party/aom/test/simd_avx2_test.cc b/media/libaom/src/test/simd_avx2_test.cc
similarity index 100%
rename from third_party/aom/test/simd_avx2_test.cc
rename to media/libaom/src/test/simd_avx2_test.cc
diff --git a/third_party/aom/test/simd_cmp_avx2.cc b/media/libaom/src/test/simd_cmp_avx2.cc
similarity index 100%
rename from third_party/aom/test/simd_cmp_avx2.cc
rename to media/libaom/src/test/simd_cmp_avx2.cc
diff --git a/third_party/aom/test/simd_cmp_impl.h b/media/libaom/src/test/simd_cmp_impl.h
similarity index 100%
rename from third_party/aom/test/simd_cmp_impl.h
rename to media/libaom/src/test/simd_cmp_impl.h
diff --git a/third_party/aom/test/simd_cmp_neon.cc b/media/libaom/src/test/simd_cmp_neon.cc
similarity index 100%
rename from third_party/aom/test/simd_cmp_neon.cc
rename to media/libaom/src/test/simd_cmp_neon.cc
diff --git a/third_party/aom/test/simd_cmp_sse2.cc b/media/libaom/src/test/simd_cmp_sse2.cc
similarity index 100%
rename from third_party/aom/test/simd_cmp_sse2.cc
rename to media/libaom/src/test/simd_cmp_sse2.cc
diff --git a/third_party/aom/test/simd_cmp_sse4.cc b/media/libaom/src/test/simd_cmp_sse4.cc
similarity index 100%
rename from third_party/aom/test/simd_cmp_sse4.cc
rename to media/libaom/src/test/simd_cmp_sse4.cc
diff --git a/third_party/aom/test/simd_cmp_ssse3.cc b/media/libaom/src/test/simd_cmp_ssse3.cc
similarity index 100%
rename from third_party/aom/test/simd_cmp_ssse3.cc
rename to media/libaom/src/test/simd_cmp_ssse3.cc
diff --git a/third_party/aom/test/simd_impl.h b/media/libaom/src/test/simd_impl.h
similarity index 100%
rename from third_party/aom/test/simd_impl.h
rename to media/libaom/src/test/simd_impl.h
diff --git a/third_party/aom/test/simd_neon_test.cc b/media/libaom/src/test/simd_neon_test.cc
similarity index 100%
rename from third_party/aom/test/simd_neon_test.cc
rename to media/libaom/src/test/simd_neon_test.cc
diff --git a/third_party/aom/test/simd_sse2_test.cc b/media/libaom/src/test/simd_sse2_test.cc
similarity index 100%
rename from third_party/aom/test/simd_sse2_test.cc
rename to media/libaom/src/test/simd_sse2_test.cc
diff --git a/third_party/aom/test/simd_sse4_test.cc b/media/libaom/src/test/simd_sse4_test.cc
similarity index 100%
rename from third_party/aom/test/simd_sse4_test.cc
rename to media/libaom/src/test/simd_sse4_test.cc
diff --git a/third_party/aom/test/simd_ssse3_test.cc b/media/libaom/src/test/simd_ssse3_test.cc
similarity index 100%
rename from third_party/aom/test/simd_ssse3_test.cc
rename to media/libaom/src/test/simd_ssse3_test.cc
diff --git a/third_party/aom/test/simple_decoder.sh b/media/libaom/src/test/simple_decoder.sh
similarity index 100%
rename from third_party/aom/test/simple_decoder.sh
rename to media/libaom/src/test/simple_decoder.sh
diff --git a/third_party/aom/test/simple_encoder.sh b/media/libaom/src/test/simple_encoder.sh
similarity index 100%
rename from third_party/aom/test/simple_encoder.sh
rename to media/libaom/src/test/simple_encoder.sh
diff --git a/third_party/aom/test/subtract_test.cc b/media/libaom/src/test/subtract_test.cc
similarity index 100%
rename from third_party/aom/test/subtract_test.cc
rename to media/libaom/src/test/subtract_test.cc
diff --git a/third_party/aom/test/sum_squares_test.cc b/media/libaom/src/test/sum_squares_test.cc
similarity index 100%
rename from third_party/aom/test/sum_squares_test.cc
rename to media/libaom/src/test/sum_squares_test.cc
diff --git a/third_party/aom/test/superframe_test.cc b/media/libaom/src/test/superframe_test.cc
similarity index 100%
rename from third_party/aom/test/superframe_test.cc
rename to media/libaom/src/test/superframe_test.cc
diff --git a/third_party/aom/test/test-data.sha1 b/media/libaom/src/test/test-data.sha1
similarity index 100%
rename from third_party/aom/test/test-data.sha1
rename to media/libaom/src/test/test-data.sha1
diff --git a/third_party/aom/test/test.cmake b/media/libaom/src/test/test.cmake
similarity index 100%
rename from third_party/aom/test/test.cmake
rename to media/libaom/src/test/test.cmake
diff --git a/third_party/aom/test/test_data_download_worker.cmake b/media/libaom/src/test/test_data_download_worker.cmake
similarity index 100%
rename from third_party/aom/test/test_data_download_worker.cmake
rename to media/libaom/src/test/test_data_download_worker.cmake
diff --git a/third_party/aom/test/test_data_util.cmake b/media/libaom/src/test/test_data_util.cmake
similarity index 100%
rename from third_party/aom/test/test_data_util.cmake
rename to media/libaom/src/test/test_data_util.cmake
diff --git a/third_party/aom/test/test_intra_pred_speed.cc b/media/libaom/src/test/test_intra_pred_speed.cc
similarity index 100%
rename from third_party/aom/test/test_intra_pred_speed.cc
rename to media/libaom/src/test/test_intra_pred_speed.cc
diff --git a/third_party/aom/test/test_libaom.cc b/media/libaom/src/test/test_libaom.cc
similarity index 100%
rename from third_party/aom/test/test_libaom.cc
rename to media/libaom/src/test/test_libaom.cc
diff --git a/third_party/aom/test/test_runner.cmake b/media/libaom/src/test/test_runner.cmake
similarity index 100%
rename from third_party/aom/test/test_runner.cmake
rename to media/libaom/src/test/test_runner.cmake
diff --git a/third_party/aom/test/test_vector_test.cc b/media/libaom/src/test/test_vector_test.cc
similarity index 100%
rename from third_party/aom/test/test_vector_test.cc
rename to media/libaom/src/test/test_vector_test.cc
diff --git a/third_party/aom/test/test_vectors.cc b/media/libaom/src/test/test_vectors.cc
similarity index 100%
rename from third_party/aom/test/test_vectors.cc
rename to media/libaom/src/test/test_vectors.cc
diff --git a/third_party/aom/test/test_vectors.h b/media/libaom/src/test/test_vectors.h
similarity index 100%
rename from third_party/aom/test/test_vectors.h
rename to media/libaom/src/test/test_vectors.h
diff --git a/third_party/aom/test/tile_independence_test.cc b/media/libaom/src/test/tile_independence_test.cc
similarity index 100%
rename from third_party/aom/test/tile_independence_test.cc
rename to media/libaom/src/test/tile_independence_test.cc
diff --git a/third_party/aom/test/tools_common.sh b/media/libaom/src/test/tools_common.sh
similarity index 100%
rename from third_party/aom/test/tools_common.sh
rename to media/libaom/src/test/tools_common.sh
diff --git a/third_party/aom/test/transform_test_base.h b/media/libaom/src/test/transform_test_base.h
similarity index 100%
rename from third_party/aom/test/transform_test_base.h
rename to media/libaom/src/test/transform_test_base.h
diff --git a/third_party/aom/test/twopass_encoder.sh b/media/libaom/src/test/twopass_encoder.sh
similarity index 100%
rename from third_party/aom/test/twopass_encoder.sh
rename to media/libaom/src/test/twopass_encoder.sh
diff --git a/third_party/aom/test/util.h b/media/libaom/src/test/util.h
similarity index 100%
rename from third_party/aom/test/util.h
rename to media/libaom/src/test/util.h
diff --git a/third_party/aom/test/variance_test.cc b/media/libaom/src/test/variance_test.cc
similarity index 100%
rename from third_party/aom/test/variance_test.cc
rename to media/libaom/src/test/variance_test.cc
diff --git a/third_party/aom/test/video_source.h b/media/libaom/src/test/video_source.h
similarity index 100%
rename from third_party/aom/test/video_source.h
rename to media/libaom/src/test/video_source.h
diff --git a/third_party/aom/test/visual_metrics.py b/media/libaom/src/test/visual_metrics.py
similarity index 100%
rename from third_party/aom/test/visual_metrics.py
rename to media/libaom/src/test/visual_metrics.py
diff --git a/third_party/aom/test/warp_filter_test.cc b/media/libaom/src/test/warp_filter_test.cc
similarity index 100%
rename from third_party/aom/test/warp_filter_test.cc
rename to media/libaom/src/test/warp_filter_test.cc
diff --git a/third_party/aom/test/warp_filter_test_util.cc b/media/libaom/src/test/warp_filter_test_util.cc
similarity index 100%
rename from third_party/aom/test/warp_filter_test_util.cc
rename to media/libaom/src/test/warp_filter_test_util.cc
diff --git a/third_party/aom/test/warp_filter_test_util.h b/media/libaom/src/test/warp_filter_test_util.h
similarity index 100%
rename from third_party/aom/test/warp_filter_test_util.h
rename to media/libaom/src/test/warp_filter_test_util.h
diff --git a/third_party/aom/test/webm_video_source.h b/media/libaom/src/test/webm_video_source.h
similarity index 100%
rename from third_party/aom/test/webm_video_source.h
rename to media/libaom/src/test/webm_video_source.h
diff --git a/third_party/aom/test/wiener_test.cc b/media/libaom/src/test/wiener_test.cc
similarity index 100%
rename from third_party/aom/test/wiener_test.cc
rename to media/libaom/src/test/wiener_test.cc
diff --git a/third_party/aom/test/y4m_test.cc b/media/libaom/src/test/y4m_test.cc
similarity index 100%
rename from third_party/aom/test/y4m_test.cc
rename to media/libaom/src/test/y4m_test.cc
diff --git a/third_party/aom/test/y4m_video_source.h b/media/libaom/src/test/y4m_video_source.h
similarity index 100%
rename from third_party/aom/test/y4m_video_source.h
rename to media/libaom/src/test/y4m_video_source.h
diff --git a/third_party/aom/test/yuv_video_source.h b/media/libaom/src/test/yuv_video_source.h
similarity index 100%
rename from third_party/aom/test/yuv_video_source.h
rename to media/libaom/src/test/yuv_video_source.h
diff --git a/third_party/aom/third_party/fastfeat/LICENSE b/media/libaom/src/third_party/fastfeat/LICENSE
similarity index 100%
rename from third_party/aom/third_party/fastfeat/LICENSE
rename to media/libaom/src/third_party/fastfeat/LICENSE
diff --git a/third_party/aom/third_party/fastfeat/README.libvpx b/media/libaom/src/third_party/fastfeat/README.libvpx
similarity index 100%
rename from third_party/aom/third_party/fastfeat/README.libvpx
rename to media/libaom/src/third_party/fastfeat/README.libvpx
diff --git a/third_party/aom/third_party/fastfeat/fast.c b/media/libaom/src/third_party/fastfeat/fast.c
similarity index 100%
rename from third_party/aom/third_party/fastfeat/fast.c
rename to media/libaom/src/third_party/fastfeat/fast.c
diff --git a/third_party/aom/third_party/fastfeat/fast.h b/media/libaom/src/third_party/fastfeat/fast.h
similarity index 100%
rename from third_party/aom/third_party/fastfeat/fast.h
rename to media/libaom/src/third_party/fastfeat/fast.h
diff --git a/third_party/aom/third_party/fastfeat/fast_9.c b/media/libaom/src/third_party/fastfeat/fast_9.c
similarity index 100%
rename from third_party/aom/third_party/fastfeat/fast_9.c
rename to media/libaom/src/third_party/fastfeat/fast_9.c
diff --git a/third_party/aom/third_party/fastfeat/nonmax.c b/media/libaom/src/third_party/fastfeat/nonmax.c
similarity index 100%
rename from third_party/aom/third_party/fastfeat/nonmax.c
rename to media/libaom/src/third_party/fastfeat/nonmax.c
diff --git a/third_party/aom/third_party/googletest/README.libaom b/media/libaom/src/third_party/googletest/README.libaom
similarity index 100%
rename from third_party/aom/third_party/googletest/README.libaom
rename to media/libaom/src/third_party/googletest/README.libaom
diff --git a/third_party/aom/third_party/googletest/gtest.mk b/media/libaom/src/third_party/googletest/gtest.mk
similarity index 100%
rename from third_party/aom/third_party/googletest/gtest.mk
rename to media/libaom/src/third_party/googletest/gtest.mk
diff --git a/third_party/aom/third_party/googletest/src/googletest/CHANGES b/media/libaom/src/third_party/googletest/src/googletest/CHANGES
similarity index 100%
rename from third_party/aom/third_party/googletest/src/googletest/CHANGES
rename to media/libaom/src/third_party/googletest/src/googletest/CHANGES
diff --git a/third_party/aom/third_party/googletest/src/googletest/CMakeLists.txt b/media/libaom/src/third_party/googletest/src/googletest/CMakeLists.txt
similarity index 100%
rename from third_party/aom/third_party/googletest/src/googletest/CMakeLists.txt
rename to media/libaom/src/third_party/googletest/src/googletest/CMakeLists.txt
diff --git a/third_party/aom/third_party/googletest/src/googletest/CONTRIBUTORS b/media/libaom/src/third_party/googletest/src/googletest/CONTRIBUTORS
similarity index 100%
rename from third_party/aom/third_party/googletest/src/googletest/CONTRIBUTORS
rename to media/libaom/src/third_party/googletest/src/googletest/CONTRIBUTORS
diff --git a/third_party/aom/third_party/googletest/src/googletest/LICENSE b/media/libaom/src/third_party/googletest/src/googletest/LICENSE
similarity index 100%
rename from third_party/aom/third_party/googletest/src/googletest/LICENSE
rename to media/libaom/src/third_party/googletest/src/googletest/LICENSE
diff --git a/third_party/aom/third_party/googletest/src/googletest/README.md b/media/libaom/src/third_party/googletest/src/googletest/README.md
similarity index 100%
rename from third_party/aom/third_party/googletest/src/googletest/README.md
rename to media/libaom/src/third_party/googletest/src/googletest/README.md
diff --git a/third_party/aom/third_party/googletest/src/googletest/cmake/internal_utils.cmake b/media/libaom/src/third_party/googletest/src/googletest/cmake/internal_utils.cmake
similarity index 100%
rename from third_party/aom/third_party/googletest/src/googletest/cmake/internal_utils.cmake
rename to media/libaom/src/third_party/googletest/src/googletest/cmake/internal_utils.cmake
diff --git a/third_party/aom/third_party/googletest/src/googletest/include/gtest/gtest-death-test.h b/media/libaom/src/third_party/googletest/src/googletest/include/gtest/gtest-death-test.h
similarity index 100%
rename from third_party/aom/third_party/googletest/src/googletest/include/gtest/gtest-death-test.h
rename to media/libaom/src/third_party/googletest/src/googletest/include/gtest/gtest-death-test.h
diff --git a/third_party/aom/third_party/googletest/src/googletest/include/gtest/gtest-message.h b/media/libaom/src/third_party/googletest/src/googletest/include/gtest/gtest-message.h
similarity index 100%
rename from third_party/aom/third_party/googletest/src/googletest/include/gtest/gtest-message.h
rename to media/libaom/src/third_party/googletest/src/googletest/include/gtest/gtest-message.h
diff --git a/third_party/aom/third_party/googletest/src/googletest/include/gtest/gtest-param-test.h b/media/libaom/src/third_party/googletest/src/googletest/include/gtest/gtest-param-test.h
similarity index 100%
rename from third_party/aom/third_party/googletest/src/googletest/include/gtest/gtest-param-test.h
rename to media/libaom/src/third_party/googletest/src/googletest/include/gtest/gtest-param-test.h
diff --git a/third_party/aom/third_party/googletest/src/googletest/include/gtest/gtest-param-test.h.pump b/media/libaom/src/third_party/googletest/src/googletest/include/gtest/gtest-param-test.h.pump
similarity index 100%
rename from third_party/aom/third_party/googletest/src/googletest/include/gtest/gtest-param-test.h.pump
rename to media/libaom/src/third_party/googletest/src/googletest/include/gtest/gtest-param-test.h.pump
diff --git a/third_party/aom/third_party/googletest/src/googletest/include/gtest/gtest-printers.h b/media/libaom/src/third_party/googletest/src/googletest/include/gtest/gtest-printers.h
similarity index 100%
rename from third_party/aom/third_party/googletest/src/googletest/include/gtest/gtest-printers.h
rename to media/libaom/src/third_party/googletest/src/googletest/include/gtest/gtest-printers.h
diff --git a/third_party/aom/third_party/googletest/src/googletest/include/gtest/gtest-spi.h b/media/libaom/src/third_party/googletest/src/googletest/include/gtest/gtest-spi.h
similarity index 100%
rename from third_party/aom/third_party/googletest/src/googletest/include/gtest/gtest-spi.h
rename to media/libaom/src/third_party/googletest/src/googletest/include/gtest/gtest-spi.h
diff --git a/third_party/aom/third_party/googletest/src/googletest/include/gtest/gtest-test-part.h b/media/libaom/src/third_party/googletest/src/googletest/include/gtest/gtest-test-part.h
similarity index 100%
rename from third_party/aom/third_party/googletest/src/googletest/include/gtest/gtest-test-part.h
rename to media/libaom/src/third_party/googletest/src/googletest/include/gtest/gtest-test-part.h
diff --git a/third_party/aom/third_party/googletest/src/googletest/include/gtest/gtest-typed-test.h b/media/libaom/src/third_party/googletest/src/googletest/include/gtest/gtest-typed-test.h
similarity index 100%
rename from third_party/aom/third_party/googletest/src/googletest/include/gtest/gtest-typed-test.h
rename to media/libaom/src/third_party/googletest/src/googletest/include/gtest/gtest-typed-test.h
diff --git a/third_party/aom/third_party/googletest/src/googletest/include/gtest/gtest.h b/media/libaom/src/third_party/googletest/src/googletest/include/gtest/gtest.h
similarity index 100%
rename from third_party/aom/third_party/googletest/src/googletest/include/gtest/gtest.h
rename to media/libaom/src/third_party/googletest/src/googletest/include/gtest/gtest.h
diff --git a/third_party/aom/third_party/googletest/src/googletest/include/gtest/gtest_pred_impl.h b/media/libaom/src/third_party/googletest/src/googletest/include/gtest/gtest_pred_impl.h
similarity index 100%
rename from third_party/aom/third_party/googletest/src/googletest/include/gtest/gtest_pred_impl.h
rename to media/libaom/src/third_party/googletest/src/googletest/include/gtest/gtest_pred_impl.h
diff --git a/third_party/aom/third_party/googletest/src/googletest/include/gtest/gtest_prod.h b/media/libaom/src/third_party/googletest/src/googletest/include/gtest/gtest_prod.h
similarity index 100%
rename from third_party/aom/third_party/googletest/src/googletest/include/gtest/gtest_prod.h
rename to media/libaom/src/third_party/googletest/src/googletest/include/gtest/gtest_prod.h
diff --git a/third_party/aom/third_party/googletest/src/googletest/include/gtest/internal/custom/gtest-port.h b/media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/custom/gtest-port.h
similarity index 100%
rename from third_party/aom/third_party/googletest/src/googletest/include/gtest/internal/custom/gtest-port.h
rename to media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/custom/gtest-port.h
diff --git a/third_party/aom/third_party/googletest/src/googletest/include/gtest/internal/custom/gtest-printers.h b/media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/custom/gtest-printers.h
similarity index 100%
rename from third_party/aom/third_party/googletest/src/googletest/include/gtest/internal/custom/gtest-printers.h
rename to media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/custom/gtest-printers.h
diff --git a/third_party/aom/third_party/googletest/src/googletest/include/gtest/internal/custom/gtest.h b/media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/custom/gtest.h
similarity index 100%
rename from third_party/aom/third_party/googletest/src/googletest/include/gtest/internal/custom/gtest.h
rename to media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/custom/gtest.h
diff --git a/third_party/aom/third_party/googletest/src/googletest/include/gtest/internal/gtest-death-test-internal.h b/media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/gtest-death-test-internal.h
similarity index 100%
rename from third_party/aom/third_party/googletest/src/googletest/include/gtest/internal/gtest-death-test-internal.h
rename to media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/gtest-death-test-internal.h
diff --git a/third_party/aom/third_party/googletest/src/googletest/include/gtest/internal/gtest-filepath.h b/media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/gtest-filepath.h
similarity index 100%
rename from third_party/aom/third_party/googletest/src/googletest/include/gtest/internal/gtest-filepath.h
rename to media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/gtest-filepath.h
diff --git a/third_party/aom/third_party/googletest/src/googletest/include/gtest/internal/gtest-internal.h b/media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/gtest-internal.h
similarity index 100%
rename from third_party/aom/third_party/googletest/src/googletest/include/gtest/internal/gtest-internal.h
rename to media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/gtest-internal.h
diff --git a/third_party/aom/third_party/googletest/src/googletest/include/gtest/internal/gtest-linked_ptr.h b/media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/gtest-linked_ptr.h
similarity index 100%
rename from third_party/aom/third_party/googletest/src/googletest/include/gtest/internal/gtest-linked_ptr.h
rename to media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/gtest-linked_ptr.h
diff --git a/third_party/aom/third_party/googletest/src/googletest/include/gtest/internal/gtest-param-util-generated.h b/media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/gtest-param-util-generated.h
similarity index 100%
rename from third_party/aom/third_party/googletest/src/googletest/include/gtest/internal/gtest-param-util-generated.h
rename to media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/gtest-param-util-generated.h
diff --git a/third_party/aom/third_party/googletest/src/googletest/include/gtest/internal/gtest-param-util-generated.h.pump b/media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/gtest-param-util-generated.h.pump
similarity index 100%
rename from third_party/aom/third_party/googletest/src/googletest/include/gtest/internal/gtest-param-util-generated.h.pump
rename to media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/gtest-param-util-generated.h.pump
diff --git a/third_party/aom/third_party/googletest/src/googletest/include/gtest/internal/gtest-param-util.h b/media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/gtest-param-util.h
similarity index 100%
rename from third_party/aom/third_party/googletest/src/googletest/include/gtest/internal/gtest-param-util.h
rename to media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/gtest-param-util.h
diff --git a/third_party/aom/third_party/googletest/src/googletest/include/gtest/internal/gtest-port-arch.h b/media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/gtest-port-arch.h
similarity index 100%
rename from third_party/aom/third_party/googletest/src/googletest/include/gtest/internal/gtest-port-arch.h
rename to media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/gtest-port-arch.h
diff --git a/third_party/aom/third_party/googletest/src/googletest/include/gtest/internal/gtest-port.h b/media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/gtest-port.h
similarity index 100%
rename from third_party/aom/third_party/googletest/src/googletest/include/gtest/internal/gtest-port.h
rename to media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/gtest-port.h
diff --git a/third_party/aom/third_party/googletest/src/googletest/include/gtest/internal/gtest-string.h b/media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/gtest-string.h
similarity index 100%
rename from third_party/aom/third_party/googletest/src/googletest/include/gtest/internal/gtest-string.h
rename to media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/gtest-string.h
diff --git a/third_party/aom/third_party/googletest/src/googletest/include/gtest/internal/gtest-tuple.h b/media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/gtest-tuple.h
similarity index 100%
rename from third_party/aom/third_party/googletest/src/googletest/include/gtest/internal/gtest-tuple.h
rename to media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/gtest-tuple.h
diff --git a/third_party/aom/third_party/googletest/src/googletest/include/gtest/internal/gtest-tuple.h.pump b/media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/gtest-tuple.h.pump
similarity index 100%
rename from third_party/aom/third_party/googletest/src/googletest/include/gtest/internal/gtest-tuple.h.pump
rename to media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/gtest-tuple.h.pump
diff --git a/third_party/aom/third_party/googletest/src/googletest/include/gtest/internal/gtest-type-util.h b/media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/gtest-type-util.h
similarity index 100%
rename from third_party/aom/third_party/googletest/src/googletest/include/gtest/internal/gtest-type-util.h
rename to media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/gtest-type-util.h
diff --git a/third_party/aom/third_party/googletest/src/googletest/include/gtest/internal/gtest-type-util.h.pump b/media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/gtest-type-util.h.pump
similarity index 100%
rename from third_party/aom/third_party/googletest/src/googletest/include/gtest/internal/gtest-type-util.h.pump
rename to media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/gtest-type-util.h.pump
diff --git a/third_party/aom/third_party/googletest/src/googletest/src/gtest-all.cc b/media/libaom/src/third_party/googletest/src/googletest/src/gtest-all.cc
similarity index 100%
rename from third_party/aom/third_party/googletest/src/googletest/src/gtest-all.cc
rename to media/libaom/src/third_party/googletest/src/googletest/src/gtest-all.cc
diff --git a/third_party/aom/third_party/googletest/src/googletest/src/gtest-death-test.cc b/media/libaom/src/third_party/googletest/src/googletest/src/gtest-death-test.cc
similarity index 100%
rename from third_party/aom/third_party/googletest/src/googletest/src/gtest-death-test.cc
rename to media/libaom/src/third_party/googletest/src/googletest/src/gtest-death-test.cc
diff --git a/third_party/aom/third_party/googletest/src/googletest/src/gtest-filepath.cc b/media/libaom/src/third_party/googletest/src/googletest/src/gtest-filepath.cc
similarity index 100%
rename from third_party/aom/third_party/googletest/src/googletest/src/gtest-filepath.cc
rename to media/libaom/src/third_party/googletest/src/googletest/src/gtest-filepath.cc
diff --git a/third_party/aom/third_party/googletest/src/googletest/src/gtest-internal-inl.h b/media/libaom/src/third_party/googletest/src/googletest/src/gtest-internal-inl.h
similarity index 100%
rename from third_party/aom/third_party/googletest/src/googletest/src/gtest-internal-inl.h
rename to media/libaom/src/third_party/googletest/src/googletest/src/gtest-internal-inl.h
diff --git a/third_party/aom/third_party/googletest/src/googletest/src/gtest-port.cc b/media/libaom/src/third_party/googletest/src/googletest/src/gtest-port.cc
similarity index 100%
rename from third_party/aom/third_party/googletest/src/googletest/src/gtest-port.cc
rename to media/libaom/src/third_party/googletest/src/googletest/src/gtest-port.cc
diff --git a/third_party/aom/third_party/googletest/src/googletest/src/gtest-printers.cc b/media/libaom/src/third_party/googletest/src/googletest/src/gtest-printers.cc
similarity index 100%
rename from third_party/aom/third_party/googletest/src/googletest/src/gtest-printers.cc
rename to media/libaom/src/third_party/googletest/src/googletest/src/gtest-printers.cc
diff --git a/third_party/aom/third_party/googletest/src/googletest/src/gtest-test-part.cc b/media/libaom/src/third_party/googletest/src/googletest/src/gtest-test-part.cc
similarity index 100%
rename from third_party/aom/third_party/googletest/src/googletest/src/gtest-test-part.cc
rename to media/libaom/src/third_party/googletest/src/googletest/src/gtest-test-part.cc
diff --git a/third_party/aom/third_party/googletest/src/googletest/src/gtest-typed-test.cc b/media/libaom/src/third_party/googletest/src/googletest/src/gtest-typed-test.cc
similarity index 100%
rename from third_party/aom/third_party/googletest/src/googletest/src/gtest-typed-test.cc
rename to media/libaom/src/third_party/googletest/src/googletest/src/gtest-typed-test.cc
diff --git a/third_party/aom/third_party/googletest/src/googletest/src/gtest.cc b/media/libaom/src/third_party/googletest/src/googletest/src/gtest.cc
similarity index 100%
rename from third_party/aom/third_party/googletest/src/googletest/src/gtest.cc
rename to media/libaom/src/third_party/googletest/src/googletest/src/gtest.cc
diff --git a/third_party/aom/third_party/googletest/src/googletest/src/gtest_main.cc b/media/libaom/src/third_party/googletest/src/googletest/src/gtest_main.cc
similarity index 100%
rename from third_party/aom/third_party/googletest/src/googletest/src/gtest_main.cc
rename to media/libaom/src/third_party/googletest/src/googletest/src/gtest_main.cc
diff --git a/third_party/aom/third_party/libwebm/AUTHORS.TXT b/media/libaom/src/third_party/libwebm/AUTHORS.TXT
similarity index 100%
rename from third_party/aom/third_party/libwebm/AUTHORS.TXT
rename to media/libaom/src/third_party/libwebm/AUTHORS.TXT
diff --git a/third_party/aom/third_party/libwebm/Android.mk b/media/libaom/src/third_party/libwebm/Android.mk
similarity index 100%
rename from third_party/aom/third_party/libwebm/Android.mk
rename to media/libaom/src/third_party/libwebm/Android.mk
diff --git a/third_party/aom/third_party/libwebm/LICENSE.TXT b/media/libaom/src/third_party/libwebm/LICENSE.TXT
similarity index 100%
rename from third_party/aom/third_party/libwebm/LICENSE.TXT
rename to media/libaom/src/third_party/libwebm/LICENSE.TXT
diff --git a/third_party/aom/third_party/libwebm/PATENTS.TXT b/media/libaom/src/third_party/libwebm/PATENTS.TXT
similarity index 100%
rename from third_party/aom/third_party/libwebm/PATENTS.TXT
rename to media/libaom/src/third_party/libwebm/PATENTS.TXT
diff --git a/third_party/aom/third_party/libwebm/README.libaom b/media/libaom/src/third_party/libwebm/README.libaom
similarity index 100%
rename from third_party/aom/third_party/libwebm/README.libaom
rename to media/libaom/src/third_party/libwebm/README.libaom
diff --git a/third_party/aom/third_party/libwebm/common/file_util.cc b/media/libaom/src/third_party/libwebm/common/file_util.cc
similarity index 100%
rename from third_party/aom/third_party/libwebm/common/file_util.cc
rename to media/libaom/src/third_party/libwebm/common/file_util.cc
diff --git a/third_party/aom/third_party/libwebm/common/file_util.h b/media/libaom/src/third_party/libwebm/common/file_util.h
similarity index 100%
rename from third_party/aom/third_party/libwebm/common/file_util.h
rename to media/libaom/src/third_party/libwebm/common/file_util.h
diff --git a/third_party/aom/third_party/libwebm/common/hdr_util.cc b/media/libaom/src/third_party/libwebm/common/hdr_util.cc
similarity index 100%
rename from third_party/aom/third_party/libwebm/common/hdr_util.cc
rename to media/libaom/src/third_party/libwebm/common/hdr_util.cc
diff --git a/third_party/aom/third_party/libwebm/common/hdr_util.h b/media/libaom/src/third_party/libwebm/common/hdr_util.h
similarity index 100%
rename from third_party/aom/third_party/libwebm/common/hdr_util.h
rename to media/libaom/src/third_party/libwebm/common/hdr_util.h
diff --git a/third_party/aom/third_party/libwebm/common/webmids.h b/media/libaom/src/third_party/libwebm/common/webmids.h
similarity index 100%
rename from third_party/aom/third_party/libwebm/common/webmids.h
rename to media/libaom/src/third_party/libwebm/common/webmids.h
diff --git a/third_party/aom/third_party/libwebm/mkvmuxer/mkvmuxer.cc b/media/libaom/src/third_party/libwebm/mkvmuxer/mkvmuxer.cc
similarity index 100%
rename from third_party/aom/third_party/libwebm/mkvmuxer/mkvmuxer.cc
rename to media/libaom/src/third_party/libwebm/mkvmuxer/mkvmuxer.cc
diff --git a/third_party/aom/third_party/libwebm/mkvmuxer/mkvmuxer.h b/media/libaom/src/third_party/libwebm/mkvmuxer/mkvmuxer.h
similarity index 100%
rename from third_party/aom/third_party/libwebm/mkvmuxer/mkvmuxer.h
rename to media/libaom/src/third_party/libwebm/mkvmuxer/mkvmuxer.h
diff --git a/third_party/aom/third_party/libwebm/mkvmuxer/mkvmuxertypes.h b/media/libaom/src/third_party/libwebm/mkvmuxer/mkvmuxertypes.h
similarity index 100%
rename from third_party/aom/third_party/libwebm/mkvmuxer/mkvmuxertypes.h
rename to media/libaom/src/third_party/libwebm/mkvmuxer/mkvmuxertypes.h
diff --git a/third_party/aom/third_party/libwebm/mkvmuxer/mkvmuxerutil.cc b/media/libaom/src/third_party/libwebm/mkvmuxer/mkvmuxerutil.cc
similarity index 100%
rename from third_party/aom/third_party/libwebm/mkvmuxer/mkvmuxerutil.cc
rename to media/libaom/src/third_party/libwebm/mkvmuxer/mkvmuxerutil.cc
diff --git a/third_party/aom/third_party/libwebm/mkvmuxer/mkvmuxerutil.h b/media/libaom/src/third_party/libwebm/mkvmuxer/mkvmuxerutil.h
similarity index 100%
rename from third_party/aom/third_party/libwebm/mkvmuxer/mkvmuxerutil.h
rename to media/libaom/src/third_party/libwebm/mkvmuxer/mkvmuxerutil.h
diff --git a/third_party/aom/third_party/libwebm/mkvmuxer/mkvwriter.cc b/media/libaom/src/third_party/libwebm/mkvmuxer/mkvwriter.cc
similarity index 100%
rename from third_party/aom/third_party/libwebm/mkvmuxer/mkvwriter.cc
rename to media/libaom/src/third_party/libwebm/mkvmuxer/mkvwriter.cc
diff --git a/third_party/aom/third_party/libwebm/mkvmuxer/mkvwriter.h b/media/libaom/src/third_party/libwebm/mkvmuxer/mkvwriter.h
similarity index 100%
rename from third_party/aom/third_party/libwebm/mkvmuxer/mkvwriter.h
rename to media/libaom/src/third_party/libwebm/mkvmuxer/mkvwriter.h
diff --git a/third_party/aom/third_party/libwebm/mkvparser/mkvparser.cc b/media/libaom/src/third_party/libwebm/mkvparser/mkvparser.cc
similarity index 100%
rename from third_party/aom/third_party/libwebm/mkvparser/mkvparser.cc
rename to media/libaom/src/third_party/libwebm/mkvparser/mkvparser.cc
diff --git a/third_party/aom/third_party/libwebm/mkvparser/mkvparser.h b/media/libaom/src/third_party/libwebm/mkvparser/mkvparser.h
similarity index 100%
rename from third_party/aom/third_party/libwebm/mkvparser/mkvparser.h
rename to media/libaom/src/third_party/libwebm/mkvparser/mkvparser.h
diff --git a/third_party/aom/third_party/libwebm/mkvparser/mkvreader.cc b/media/libaom/src/third_party/libwebm/mkvparser/mkvreader.cc
similarity index 100%
rename from third_party/aom/third_party/libwebm/mkvparser/mkvreader.cc
rename to media/libaom/src/third_party/libwebm/mkvparser/mkvreader.cc
diff --git a/third_party/aom/third_party/libwebm/mkvparser/mkvreader.h b/media/libaom/src/third_party/libwebm/mkvparser/mkvreader.h
similarity index 100%
rename from third_party/aom/third_party/libwebm/mkvparser/mkvreader.h
rename to media/libaom/src/third_party/libwebm/mkvparser/mkvreader.h
diff --git a/third_party/aom/third_party/libyuv/README.libaom b/media/libaom/src/third_party/libyuv/README.libaom
similarity index 100%
rename from third_party/aom/third_party/libyuv/README.libaom
rename to media/libaom/src/third_party/libyuv/README.libaom
diff --git a/third_party/aom/third_party/libyuv/include/libyuv/basic_types.h b/media/libaom/src/third_party/libyuv/include/libyuv/basic_types.h
similarity index 100%
rename from third_party/aom/third_party/libyuv/include/libyuv/basic_types.h
rename to media/libaom/src/third_party/libyuv/include/libyuv/basic_types.h
diff --git a/third_party/aom/third_party/libyuv/include/libyuv/compare.h b/media/libaom/src/third_party/libyuv/include/libyuv/compare.h
similarity index 100%
rename from third_party/aom/third_party/libyuv/include/libyuv/compare.h
rename to media/libaom/src/third_party/libyuv/include/libyuv/compare.h
diff --git a/third_party/aom/third_party/libyuv/include/libyuv/convert.h b/media/libaom/src/third_party/libyuv/include/libyuv/convert.h
similarity index 100%
rename from third_party/aom/third_party/libyuv/include/libyuv/convert.h
rename to media/libaom/src/third_party/libyuv/include/libyuv/convert.h
diff --git a/third_party/aom/third_party/libyuv/include/libyuv/convert_argb.h b/media/libaom/src/third_party/libyuv/include/libyuv/convert_argb.h
similarity index 100%
rename from third_party/aom/third_party/libyuv/include/libyuv/convert_argb.h
rename to media/libaom/src/third_party/libyuv/include/libyuv/convert_argb.h
diff --git a/third_party/aom/third_party/libyuv/include/libyuv/convert_from.h b/media/libaom/src/third_party/libyuv/include/libyuv/convert_from.h
similarity index 100%
rename from third_party/aom/third_party/libyuv/include/libyuv/convert_from.h
rename to media/libaom/src/third_party/libyuv/include/libyuv/convert_from.h
diff --git a/third_party/aom/third_party/libyuv/include/libyuv/convert_from_argb.h b/media/libaom/src/third_party/libyuv/include/libyuv/convert_from_argb.h
similarity index 100%
rename from third_party/aom/third_party/libyuv/include/libyuv/convert_from_argb.h
rename to media/libaom/src/third_party/libyuv/include/libyuv/convert_from_argb.h
diff --git a/third_party/aom/third_party/libyuv/include/libyuv/cpu_id.h b/media/libaom/src/third_party/libyuv/include/libyuv/cpu_id.h
similarity index 100%
rename from third_party/aom/third_party/libyuv/include/libyuv/cpu_id.h
rename to media/libaom/src/third_party/libyuv/include/libyuv/cpu_id.h
diff --git a/third_party/aom/third_party/libyuv/include/libyuv/mjpeg_decoder.h b/media/libaom/src/third_party/libyuv/include/libyuv/mjpeg_decoder.h
similarity index 100%
rename from third_party/aom/third_party/libyuv/include/libyuv/mjpeg_decoder.h
rename to media/libaom/src/third_party/libyuv/include/libyuv/mjpeg_decoder.h
diff --git a/third_party/aom/third_party/libyuv/include/libyuv/planar_functions.h b/media/libaom/src/third_party/libyuv/include/libyuv/planar_functions.h
similarity index 100%
rename from third_party/aom/third_party/libyuv/include/libyuv/planar_functions.h
rename to media/libaom/src/third_party/libyuv/include/libyuv/planar_functions.h
diff --git a/third_party/aom/third_party/libyuv/include/libyuv/rotate.h b/media/libaom/src/third_party/libyuv/include/libyuv/rotate.h
similarity index 100%
rename from third_party/aom/third_party/libyuv/include/libyuv/rotate.h
rename to media/libaom/src/third_party/libyuv/include/libyuv/rotate.h
diff --git a/third_party/aom/third_party/libyuv/include/libyuv/rotate_argb.h b/media/libaom/src/third_party/libyuv/include/libyuv/rotate_argb.h
similarity index 100%
rename from third_party/aom/third_party/libyuv/include/libyuv/rotate_argb.h
rename to media/libaom/src/third_party/libyuv/include/libyuv/rotate_argb.h
diff --git a/third_party/aom/third_party/libyuv/include/libyuv/rotate_row.h b/media/libaom/src/third_party/libyuv/include/libyuv/rotate_row.h
similarity index 100%
rename from third_party/aom/third_party/libyuv/include/libyuv/rotate_row.h
rename to media/libaom/src/third_party/libyuv/include/libyuv/rotate_row.h
diff --git a/third_party/aom/third_party/libyuv/include/libyuv/row.h b/media/libaom/src/third_party/libyuv/include/libyuv/row.h
similarity index 100%
rename from third_party/aom/third_party/libyuv/include/libyuv/row.h
rename to media/libaom/src/third_party/libyuv/include/libyuv/row.h
diff --git a/third_party/aom/third_party/libyuv/include/libyuv/scale.h b/media/libaom/src/third_party/libyuv/include/libyuv/scale.h
similarity index 100%
rename from third_party/aom/third_party/libyuv/include/libyuv/scale.h
rename to media/libaom/src/third_party/libyuv/include/libyuv/scale.h
diff --git a/third_party/aom/third_party/libyuv/include/libyuv/scale_argb.h b/media/libaom/src/third_party/libyuv/include/libyuv/scale_argb.h
similarity index 100%
rename from third_party/aom/third_party/libyuv/include/libyuv/scale_argb.h
rename to media/libaom/src/third_party/libyuv/include/libyuv/scale_argb.h
diff --git a/third_party/aom/third_party/libyuv/include/libyuv/scale_row.h b/media/libaom/src/third_party/libyuv/include/libyuv/scale_row.h
similarity index 100%
rename from third_party/aom/third_party/libyuv/include/libyuv/scale_row.h
rename to media/libaom/src/third_party/libyuv/include/libyuv/scale_row.h
diff --git a/third_party/aom/third_party/libyuv/include/libyuv/version.h b/media/libaom/src/third_party/libyuv/include/libyuv/version.h
similarity index 100%
rename from third_party/aom/third_party/libyuv/include/libyuv/version.h
rename to media/libaom/src/third_party/libyuv/include/libyuv/version.h
diff --git a/third_party/aom/third_party/libyuv/include/libyuv/video_common.h b/media/libaom/src/third_party/libyuv/include/libyuv/video_common.h
similarity index 100%
rename from third_party/aom/third_party/libyuv/include/libyuv/video_common.h
rename to media/libaom/src/third_party/libyuv/include/libyuv/video_common.h
diff --git a/third_party/aom/third_party/libyuv/source/compare.cc b/media/libaom/src/third_party/libyuv/source/compare.cc
similarity index 100%
rename from third_party/aom/third_party/libyuv/source/compare.cc
rename to media/libaom/src/third_party/libyuv/source/compare.cc
diff --git a/third_party/aom/third_party/libyuv/source/compare_common.cc b/media/libaom/src/third_party/libyuv/source/compare_common.cc
similarity index 100%
rename from third_party/aom/third_party/libyuv/source/compare_common.cc
rename to media/libaom/src/third_party/libyuv/source/compare_common.cc
diff --git a/third_party/aom/third_party/libyuv/source/compare_gcc.cc b/media/libaom/src/third_party/libyuv/source/compare_gcc.cc
similarity index 100%
rename from third_party/aom/third_party/libyuv/source/compare_gcc.cc
rename to media/libaom/src/third_party/libyuv/source/compare_gcc.cc
diff --git a/third_party/aom/third_party/libyuv/source/compare_neon.cc b/media/libaom/src/third_party/libyuv/source/compare_neon.cc
similarity index 100%
rename from third_party/aom/third_party/libyuv/source/compare_neon.cc
rename to media/libaom/src/third_party/libyuv/source/compare_neon.cc
diff --git a/third_party/aom/third_party/libyuv/source/compare_neon64.cc b/media/libaom/src/third_party/libyuv/source/compare_neon64.cc
similarity index 100%
rename from third_party/aom/third_party/libyuv/source/compare_neon64.cc
rename to media/libaom/src/third_party/libyuv/source/compare_neon64.cc
diff --git a/third_party/aom/third_party/libyuv/source/compare_win.cc b/media/libaom/src/third_party/libyuv/source/compare_win.cc
similarity index 100%
rename from third_party/aom/third_party/libyuv/source/compare_win.cc
rename to media/libaom/src/third_party/libyuv/source/compare_win.cc
diff --git a/third_party/aom/third_party/libyuv/source/convert.cc b/media/libaom/src/third_party/libyuv/source/convert.cc
similarity index 100%
rename from third_party/aom/third_party/libyuv/source/convert.cc
rename to media/libaom/src/third_party/libyuv/source/convert.cc
diff --git a/third_party/aom/third_party/libyuv/source/convert_argb.cc b/media/libaom/src/third_party/libyuv/source/convert_argb.cc
similarity index 100%
rename from third_party/aom/third_party/libyuv/source/convert_argb.cc
rename to media/libaom/src/third_party/libyuv/source/convert_argb.cc
diff --git a/third_party/aom/third_party/libyuv/source/convert_from.cc b/media/libaom/src/third_party/libyuv/source/convert_from.cc
similarity index 100%
rename from third_party/aom/third_party/libyuv/source/convert_from.cc
rename to media/libaom/src/third_party/libyuv/source/convert_from.cc
diff --git a/third_party/aom/third_party/libyuv/source/convert_from_argb.cc b/media/libaom/src/third_party/libyuv/source/convert_from_argb.cc
similarity index 100%
rename from third_party/aom/third_party/libyuv/source/convert_from_argb.cc
rename to media/libaom/src/third_party/libyuv/source/convert_from_argb.cc
diff --git a/third_party/aom/third_party/libyuv/source/convert_jpeg.cc b/media/libaom/src/third_party/libyuv/source/convert_jpeg.cc
similarity index 100%
rename from third_party/aom/third_party/libyuv/source/convert_jpeg.cc
rename to media/libaom/src/third_party/libyuv/source/convert_jpeg.cc
diff --git a/third_party/aom/third_party/libyuv/source/convert_to_argb.cc b/media/libaom/src/third_party/libyuv/source/convert_to_argb.cc
similarity index 100%
rename from third_party/aom/third_party/libyuv/source/convert_to_argb.cc
rename to media/libaom/src/third_party/libyuv/source/convert_to_argb.cc
diff --git a/third_party/aom/third_party/libyuv/source/convert_to_i420.cc b/media/libaom/src/third_party/libyuv/source/convert_to_i420.cc
similarity index 100%
rename from third_party/aom/third_party/libyuv/source/convert_to_i420.cc
rename to media/libaom/src/third_party/libyuv/source/convert_to_i420.cc
diff --git a/third_party/aom/third_party/libyuv/source/cpu_id.cc b/media/libaom/src/third_party/libyuv/source/cpu_id.cc
similarity index 100%
rename from third_party/aom/third_party/libyuv/source/cpu_id.cc
rename to media/libaom/src/third_party/libyuv/source/cpu_id.cc
diff --git a/third_party/aom/third_party/libyuv/source/mjpeg_decoder.cc b/media/libaom/src/third_party/libyuv/source/mjpeg_decoder.cc
similarity index 100%
rename from third_party/aom/third_party/libyuv/source/mjpeg_decoder.cc
rename to media/libaom/src/third_party/libyuv/source/mjpeg_decoder.cc
diff --git a/third_party/aom/third_party/libyuv/source/mjpeg_validate.cc b/media/libaom/src/third_party/libyuv/source/mjpeg_validate.cc
similarity index 100%
rename from third_party/aom/third_party/libyuv/source/mjpeg_validate.cc
rename to media/libaom/src/third_party/libyuv/source/mjpeg_validate.cc
diff --git a/third_party/aom/third_party/libyuv/source/planar_functions.cc b/media/libaom/src/third_party/libyuv/source/planar_functions.cc
similarity index 100%
rename from third_party/aom/third_party/libyuv/source/planar_functions.cc
rename to media/libaom/src/third_party/libyuv/source/planar_functions.cc
diff --git a/third_party/aom/third_party/libyuv/source/rotate.cc b/media/libaom/src/third_party/libyuv/source/rotate.cc
similarity index 100%
rename from third_party/aom/third_party/libyuv/source/rotate.cc
rename to media/libaom/src/third_party/libyuv/source/rotate.cc
diff --git a/third_party/aom/third_party/libyuv/source/rotate_any.cc b/media/libaom/src/third_party/libyuv/source/rotate_any.cc
similarity index 100%
rename from third_party/aom/third_party/libyuv/source/rotate_any.cc
rename to media/libaom/src/third_party/libyuv/source/rotate_any.cc
diff --git a/third_party/aom/third_party/libyuv/source/rotate_argb.cc b/media/libaom/src/third_party/libyuv/source/rotate_argb.cc
similarity index 100%
rename from third_party/aom/third_party/libyuv/source/rotate_argb.cc
rename to media/libaom/src/third_party/libyuv/source/rotate_argb.cc
diff --git a/third_party/aom/third_party/libyuv/source/rotate_common.cc b/media/libaom/src/third_party/libyuv/source/rotate_common.cc
similarity index 100%
rename from third_party/aom/third_party/libyuv/source/rotate_common.cc
rename to media/libaom/src/third_party/libyuv/source/rotate_common.cc
diff --git a/third_party/aom/third_party/libyuv/source/rotate_gcc.cc b/media/libaom/src/third_party/libyuv/source/rotate_gcc.cc
similarity index 100%
rename from third_party/aom/third_party/libyuv/source/rotate_gcc.cc
rename to media/libaom/src/third_party/libyuv/source/rotate_gcc.cc
diff --git a/third_party/aom/third_party/libyuv/source/rotate_mips.cc b/media/libaom/src/third_party/libyuv/source/rotate_mips.cc
similarity index 100%
rename from third_party/aom/third_party/libyuv/source/rotate_mips.cc
rename to media/libaom/src/third_party/libyuv/source/rotate_mips.cc
diff --git a/third_party/aom/third_party/libyuv/source/rotate_neon.cc b/media/libaom/src/third_party/libyuv/source/rotate_neon.cc
similarity index 100%
rename from third_party/aom/third_party/libyuv/source/rotate_neon.cc
rename to media/libaom/src/third_party/libyuv/source/rotate_neon.cc
diff --git a/third_party/aom/third_party/libyuv/source/rotate_neon64.cc b/media/libaom/src/third_party/libyuv/source/rotate_neon64.cc
similarity index 100%
rename from third_party/aom/third_party/libyuv/source/rotate_neon64.cc
rename to media/libaom/src/third_party/libyuv/source/rotate_neon64.cc
diff --git a/third_party/aom/third_party/libyuv/source/rotate_win.cc b/media/libaom/src/third_party/libyuv/source/rotate_win.cc
similarity index 100%
rename from third_party/aom/third_party/libyuv/source/rotate_win.cc
rename to media/libaom/src/third_party/libyuv/source/rotate_win.cc
diff --git a/third_party/aom/third_party/libyuv/source/row_any.cc b/media/libaom/src/third_party/libyuv/source/row_any.cc
similarity index 100%
rename from third_party/aom/third_party/libyuv/source/row_any.cc
rename to media/libaom/src/third_party/libyuv/source/row_any.cc
diff --git a/third_party/aom/third_party/libyuv/source/row_common.cc b/media/libaom/src/third_party/libyuv/source/row_common.cc
similarity index 100%
rename from third_party/aom/third_party/libyuv/source/row_common.cc
rename to media/libaom/src/third_party/libyuv/source/row_common.cc
diff --git a/third_party/aom/third_party/libyuv/source/row_gcc.cc b/media/libaom/src/third_party/libyuv/source/row_gcc.cc
similarity index 100%
rename from third_party/aom/third_party/libyuv/source/row_gcc.cc
rename to media/libaom/src/third_party/libyuv/source/row_gcc.cc
diff --git a/third_party/aom/third_party/libyuv/source/row_mips.cc b/media/libaom/src/third_party/libyuv/source/row_mips.cc
similarity index 100%
rename from third_party/aom/third_party/libyuv/source/row_mips.cc
rename to media/libaom/src/third_party/libyuv/source/row_mips.cc
diff --git a/third_party/aom/third_party/libyuv/source/row_neon.cc b/media/libaom/src/third_party/libyuv/source/row_neon.cc
similarity index 100%
rename from third_party/aom/third_party/libyuv/source/row_neon.cc
rename to media/libaom/src/third_party/libyuv/source/row_neon.cc
diff --git a/third_party/aom/third_party/libyuv/source/row_neon64.cc b/media/libaom/src/third_party/libyuv/source/row_neon64.cc
similarity index 100%
rename from third_party/aom/third_party/libyuv/source/row_neon64.cc
rename to media/libaom/src/third_party/libyuv/source/row_neon64.cc
diff --git a/third_party/aom/third_party/libyuv/source/row_win.cc b/media/libaom/src/third_party/libyuv/source/row_win.cc
similarity index 100%
rename from third_party/aom/third_party/libyuv/source/row_win.cc
rename to media/libaom/src/third_party/libyuv/source/row_win.cc
diff --git a/third_party/aom/third_party/libyuv/source/row_x86.asm b/media/libaom/src/third_party/libyuv/source/row_x86.asm
similarity index 100%
rename from third_party/aom/third_party/libyuv/source/row_x86.asm
rename to media/libaom/src/third_party/libyuv/source/row_x86.asm
diff --git a/third_party/aom/third_party/libyuv/source/scale.cc b/media/libaom/src/third_party/libyuv/source/scale.cc
similarity index 100%
rename from third_party/aom/third_party/libyuv/source/scale.cc
rename to media/libaom/src/third_party/libyuv/source/scale.cc
diff --git a/third_party/aom/third_party/libyuv/source/scale_any.cc b/media/libaom/src/third_party/libyuv/source/scale_any.cc
similarity index 100%
rename from third_party/aom/third_party/libyuv/source/scale_any.cc
rename to media/libaom/src/third_party/libyuv/source/scale_any.cc
diff --git a/third_party/aom/third_party/libyuv/source/scale_argb.cc b/media/libaom/src/third_party/libyuv/source/scale_argb.cc
similarity index 100%
rename from third_party/aom/third_party/libyuv/source/scale_argb.cc
rename to media/libaom/src/third_party/libyuv/source/scale_argb.cc
diff --git a/third_party/aom/third_party/libyuv/source/scale_common.cc b/media/libaom/src/third_party/libyuv/source/scale_common.cc
similarity index 100%
rename from third_party/aom/third_party/libyuv/source/scale_common.cc
rename to media/libaom/src/third_party/libyuv/source/scale_common.cc
diff --git a/third_party/aom/third_party/libyuv/source/scale_gcc.cc b/media/libaom/src/third_party/libyuv/source/scale_gcc.cc
similarity index 100%
rename from third_party/aom/third_party/libyuv/source/scale_gcc.cc
rename to media/libaom/src/third_party/libyuv/source/scale_gcc.cc
diff --git a/third_party/aom/third_party/libyuv/source/scale_mips.cc b/media/libaom/src/third_party/libyuv/source/scale_mips.cc
similarity index 100%
rename from third_party/aom/third_party/libyuv/source/scale_mips.cc
rename to media/libaom/src/third_party/libyuv/source/scale_mips.cc
diff --git a/third_party/aom/third_party/libyuv/source/scale_neon.cc b/media/libaom/src/third_party/libyuv/source/scale_neon.cc
similarity index 100%
rename from third_party/aom/third_party/libyuv/source/scale_neon.cc
rename to media/libaom/src/third_party/libyuv/source/scale_neon.cc
diff --git a/third_party/aom/third_party/libyuv/source/scale_neon64.cc b/media/libaom/src/third_party/libyuv/source/scale_neon64.cc
similarity index 100%
rename from third_party/aom/third_party/libyuv/source/scale_neon64.cc
rename to media/libaom/src/third_party/libyuv/source/scale_neon64.cc
diff --git a/third_party/aom/third_party/libyuv/source/scale_win.cc b/media/libaom/src/third_party/libyuv/source/scale_win.cc
similarity index 100%
rename from third_party/aom/third_party/libyuv/source/scale_win.cc
rename to media/libaom/src/third_party/libyuv/source/scale_win.cc
diff --git a/third_party/aom/third_party/libyuv/source/video_common.cc b/media/libaom/src/third_party/libyuv/source/video_common.cc
similarity index 100%
rename from third_party/aom/third_party/libyuv/source/video_common.cc
rename to media/libaom/src/third_party/libyuv/source/video_common.cc
diff --git a/third_party/aom/third_party/libyuv/source/x86inc.asm b/media/libaom/src/third_party/libyuv/source/x86inc.asm
similarity index 100%
rename from third_party/aom/third_party/libyuv/source/x86inc.asm
rename to media/libaom/src/third_party/libyuv/source/x86inc.asm
diff --git a/third_party/aom/third_party/vector/LICENSE b/media/libaom/src/third_party/vector/LICENSE
similarity index 100%
rename from third_party/aom/third_party/vector/LICENSE
rename to media/libaom/src/third_party/vector/LICENSE
diff --git a/third_party/aom/third_party/vector/README.libaom b/media/libaom/src/third_party/vector/README.libaom
similarity index 100%
rename from third_party/aom/third_party/vector/README.libaom
rename to media/libaom/src/third_party/vector/README.libaom
diff --git a/third_party/aom/third_party/vector/vector.c b/media/libaom/src/third_party/vector/vector.c
similarity index 100%
rename from third_party/aom/third_party/vector/vector.c
rename to media/libaom/src/third_party/vector/vector.c
diff --git a/third_party/aom/third_party/vector/vector.h b/media/libaom/src/third_party/vector/vector.h
similarity index 100%
rename from third_party/aom/third_party/vector/vector.h
rename to media/libaom/src/third_party/vector/vector.h
diff --git a/third_party/aom/third_party/x86inc/LICENSE b/media/libaom/src/third_party/x86inc/LICENSE
similarity index 100%
rename from third_party/aom/third_party/x86inc/LICENSE
rename to media/libaom/src/third_party/x86inc/LICENSE
diff --git a/third_party/aom/third_party/x86inc/README.libaom b/media/libaom/src/third_party/x86inc/README.libaom
similarity index 100%
rename from third_party/aom/third_party/x86inc/README.libaom
rename to media/libaom/src/third_party/x86inc/README.libaom
diff --git a/third_party/aom/third_party/x86inc/x86inc.asm b/media/libaom/src/third_party/x86inc/x86inc.asm
similarity index 100%
rename from third_party/aom/third_party/x86inc/x86inc.asm
rename to media/libaom/src/third_party/x86inc/x86inc.asm
diff --git a/third_party/aom/tools/aggregate_entropy_stats.py b/media/libaom/src/tools/aggregate_entropy_stats.py
similarity index 100%
rename from third_party/aom/tools/aggregate_entropy_stats.py
rename to media/libaom/src/tools/aggregate_entropy_stats.py
diff --git a/third_party/aom/tools/aom_entropy_optimizer.c b/media/libaom/src/tools/aom_entropy_optimizer.c
similarity index 100%
rename from third_party/aom/tools/aom_entropy_optimizer.c
rename to media/libaom/src/tools/aom_entropy_optimizer.c
diff --git a/third_party/aom/tools/cpplint.py b/media/libaom/src/tools/cpplint.py
similarity index 100%
rename from third_party/aom/tools/cpplint.py
rename to media/libaom/src/tools/cpplint.py
diff --git a/third_party/aom/tools/diff.py b/media/libaom/src/tools/diff.py
similarity index 100%
rename from third_party/aom/tools/diff.py
rename to media/libaom/src/tools/diff.py
diff --git a/third_party/aom/tools/dump_obu.cc b/media/libaom/src/tools/dump_obu.cc
similarity index 100%
rename from third_party/aom/tools/dump_obu.cc
rename to media/libaom/src/tools/dump_obu.cc
diff --git a/third_party/aom/tools/gen_authors.sh b/media/libaom/src/tools/gen_authors.sh
similarity index 100%
rename from third_party/aom/tools/gen_authors.sh
rename to media/libaom/src/tools/gen_authors.sh
diff --git a/third_party/aom/tools/gen_constrained_tokenset.py b/media/libaom/src/tools/gen_constrained_tokenset.py
similarity index 100%
rename from third_party/aom/tools/gen_constrained_tokenset.py
rename to media/libaom/src/tools/gen_constrained_tokenset.py
diff --git a/third_party/aom/tools/inspect-cli.js b/media/libaom/src/tools/inspect-cli.js
similarity index 100%
rename from third_party/aom/tools/inspect-cli.js
rename to media/libaom/src/tools/inspect-cli.js
diff --git a/third_party/aom/tools/inspect-post.js b/media/libaom/src/tools/inspect-post.js
similarity index 100%
rename from third_party/aom/tools/inspect-post.js
rename to media/libaom/src/tools/inspect-post.js
diff --git a/third_party/aom/tools/intersect-diffs.py b/media/libaom/src/tools/intersect-diffs.py
similarity index 100%
rename from third_party/aom/tools/intersect-diffs.py
rename to media/libaom/src/tools/intersect-diffs.py
diff --git a/third_party/aom/tools/lint-hunks.py b/media/libaom/src/tools/lint-hunks.py
similarity index 100%
rename from third_party/aom/tools/lint-hunks.py
rename to media/libaom/src/tools/lint-hunks.py
diff --git a/third_party/aom/tools/obu_parser.cc b/media/libaom/src/tools/obu_parser.cc
similarity index 100%
rename from third_party/aom/tools/obu_parser.cc
rename to media/libaom/src/tools/obu_parser.cc
diff --git a/third_party/aom/tools/obu_parser.h b/media/libaom/src/tools/obu_parser.h
similarity index 100%
rename from third_party/aom/tools/obu_parser.h
rename to media/libaom/src/tools/obu_parser.h
diff --git a/third_party/aom/tools/txfm_analyzer/txfm_gen_code.cc b/media/libaom/src/tools/txfm_analyzer/txfm_gen_code.cc
similarity index 100%
rename from third_party/aom/tools/txfm_analyzer/txfm_gen_code.cc
rename to media/libaom/src/tools/txfm_analyzer/txfm_gen_code.cc
diff --git a/third_party/aom/tools/txfm_analyzer/txfm_graph.cc b/media/libaom/src/tools/txfm_analyzer/txfm_graph.cc
similarity index 100%
rename from third_party/aom/tools/txfm_analyzer/txfm_graph.cc
rename to media/libaom/src/tools/txfm_analyzer/txfm_graph.cc
diff --git a/third_party/aom/tools/txfm_analyzer/txfm_graph.h b/media/libaom/src/tools/txfm_analyzer/txfm_graph.h
similarity index 100%
rename from third_party/aom/tools/txfm_analyzer/txfm_graph.h
rename to media/libaom/src/tools/txfm_analyzer/txfm_graph.h
diff --git a/third_party/aom/tools/wrap-commit-msg.py b/media/libaom/src/tools/wrap-commit-msg.py
similarity index 100%
rename from third_party/aom/tools/wrap-commit-msg.py
rename to media/libaom/src/tools/wrap-commit-msg.py
diff --git a/third_party/aom/usage.dox b/media/libaom/src/usage.dox
similarity index 100%
rename from third_party/aom/usage.dox
rename to media/libaom/src/usage.dox
diff --git a/third_party/aom/usage_cx.dox b/media/libaom/src/usage_cx.dox
similarity index 100%
rename from third_party/aom/usage_cx.dox
rename to media/libaom/src/usage_cx.dox
diff --git a/third_party/aom/usage_dx.dox b/media/libaom/src/usage_dx.dox
similarity index 100%
rename from third_party/aom/usage_dx.dox
rename to media/libaom/src/usage_dx.dox