Move aom source to a sub-directory under media/libaom

There is no damned reason to treat this differently than any other media lib given its license and there never was.

1002 files changed, 517 insertions, 517 deletions

diff --git a/media/libaom/generate_sources_mozbuild.py b/media/libaom/generate_sources_mozbuild.py
index a5a75d8bee..2f89c99488 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 fc12b7230c..d712d145d7 100755
--- 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 e376878cc4..f2d122d763 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 9aff837c49..9396376375 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
index e76a526e4b..e76a526e4b 100644
--- a/third_party/aom/.clang-format
+++ b/media/libaom/src/.clang-format
diff --git a/third_party/aom/.cmake-format.py b/media/libaom/src/.cmake-format.py
index aa7354c2ae..aa7354c2ae 100644
--- a/third_party/aom/.cmake-format.py
+++ b/media/libaom/src/.cmake-format.py
diff --git a/third_party/aom/.mailmap b/media/libaom/src/.mailmap
index bbe4525b18..bbe4525b18 100644
--- a/third_party/aom/.mailmap
+++ b/media/libaom/src/.mailmap
diff --git a/third_party/aom/AUTHORS b/media/libaom/src/AUTHORS
index 95c3c8bf2b..95c3c8bf2b 100644
--- a/third_party/aom/AUTHORS
+++ b/media/libaom/src/AUTHORS
diff --git a/third_party/aom/CHANGELOG b/media/libaom/src/CHANGELOG
index d84aa02499..d84aa02499 100644
--- a/third_party/aom/CHANGELOG
+++ b/media/libaom/src/CHANGELOG
diff --git a/third_party/aom/CMakeLists.txt b/media/libaom/src/CMakeLists.txt
index a58e54f40a..a58e54f40a 100644
--- a/third_party/aom/CMakeLists.txt
+++ b/media/libaom/src/CMakeLists.txt
diff --git a/third_party/aom/LICENSE b/media/libaom/src/LICENSE
index fc340c3764..fc340c3764 100644
--- a/third_party/aom/LICENSE
+++ b/media/libaom/src/LICENSE
diff --git a/third_party/aom/PATENTS b/media/libaom/src/PATENTS
index 97842e02f1..97842e02f1 100644
--- a/third_party/aom/PATENTS
+++ b/media/libaom/src/PATENTS
diff --git a/third_party/aom/README.md b/media/libaom/src/README.md
index cab3f9993f..cab3f9993f 100644
--- a/third_party/aom/README.md
+++ b/media/libaom/src/README.md
diff --git a/third_party/aom/aom/aom.h b/media/libaom/src/aom/aom.h
index b1cc1ecceb..b1cc1ecceb 100644
--- a/third_party/aom/aom/aom.h
+++ b/media/libaom/src/aom/aom.h
diff --git a/third_party/aom/aom/aom_codec.h b/media/libaom/src/aom/aom_codec.h
index fc0df5b9eb..fc0df5b9eb 100644
--- a/third_party/aom/aom/aom_codec.h
+++ b/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
index 06c2dc5f7b..06c2dc5f7b 100644
--- a/third_party/aom/aom/aom_decoder.h
+++ b/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
index 0894ca9e31..0894ca9e31 100644
--- a/third_party/aom/aom/aom_encoder.h
+++ b/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
index fba4322f85..fba4322f85 100644
--- a/third_party/aom/aom/aom_frame_buffer.h
+++ b/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
index a960127f15..a960127f15 100644
--- a/third_party/aom/aom/aom_image.h
+++ b/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
index 90263bd4f2..90263bd4f2 100644
--- a/third_party/aom/aom/aom_integer.h
+++ b/media/libaom/src/aom/aom_integer.h
diff --git a/third_party/aom/aom/aomcx.h b/media/libaom/src/aom/aomcx.h
index 013ddf57e8..013ddf57e8 100644
--- a/third_party/aom/aom/aomcx.h
+++ b/media/libaom/src/aom/aomcx.h
diff --git a/third_party/aom/aom/aomdx.h b/media/libaom/src/aom/aomdx.h
index 765856a1bb..765856a1bb 100644
--- a/third_party/aom/aom/aomdx.h
+++ b/media/libaom/src/aom/aomdx.h
diff --git a/third_party/aom/aom/exports_com b/media/libaom/src/aom/exports_com
index 2798bd51ad..2798bd51ad 100644
--- a/third_party/aom/aom/exports_com
+++ b/media/libaom/src/aom/exports_com
diff --git a/third_party/aom/aom/exports_dec b/media/libaom/src/aom/exports_dec
index d7d1c4f7da..d7d1c4f7da 100644
--- a/third_party/aom/aom/exports_dec
+++ b/media/libaom/src/aom/exports_dec
diff --git a/third_party/aom/aom/exports_enc b/media/libaom/src/aom/exports_enc
index 918d742f05..918d742f05 100644
--- a/third_party/aom/aom/exports_enc
+++ b/media/libaom/src/aom/exports_enc
diff --git a/third_party/aom/aom/exports_test b/media/libaom/src/aom/exports_test
index 01b864bae5..01b864bae5 100644
--- a/third_party/aom/aom/exports_test
+++ b/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
index 21c0dc69c7..21c0dc69c7 100644
--- a/third_party/aom/aom/internal/aom_codec_internal.h
+++ b/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
index 733bffb25d..733bffb25d 100644
--- a/third_party/aom/aom/src/aom_codec.c
+++ b/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
index 8c9111faf0..8c9111faf0 100644
--- a/third_party/aom/aom/src/aom_decoder.c
+++ b/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
index 523f40bbed..523f40bbed 100644
--- a/third_party/aom/aom/src/aom_encoder.c
+++ b/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
index 437f0241eb..437f0241eb 100644
--- a/third_party/aom/aom/src/aom_image.c
+++ b/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
index 7edfd0de87..7edfd0de87 100644
--- a/third_party/aom/aom/src/aom_integer.c
+++ b/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
index bfb3e7e009..bfb3e7e009 100644
--- a/third_party/aom/aom_dsp/add_noise.c
+++ b/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
index 4791826da2..4791826da2 100644
--- a/third_party/aom/aom_dsp/aom_convolve.c
+++ b/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
index 11ff73756b..11ff73756b 100644
--- a/third_party/aom/aom_dsp/aom_dsp.cmake
+++ b/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
index a185b23c8e..a185b23c8e 100644
--- a/third_party/aom/aom_dsp/aom_dsp_common.h
+++ b/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
index 1514bd64e6..1514bd64e6 100644
--- a/third_party/aom/aom_dsp/aom_dsp_rtcd.c
+++ b/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
index 8e8a480fec..8e8a480fec 100755..100644
--- a/third_party/aom/aom_dsp/aom_dsp_rtcd_defs.pl
+++ b/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
index 00686ac388..00686ac388 100644
--- a/third_party/aom/aom_dsp/aom_filter.h
+++ b/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
index ab950ca55b..ab950ca55b 100644
--- a/third_party/aom/aom_dsp/aom_simd.h
+++ b/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
index eb333f6f66..eb333f6f66 100644
--- a/third_party/aom/aom_dsp/aom_simd_inline.h
+++ b/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
index e7f08a5fdb..e7f08a5fdb 100644
--- a/third_party/aom/aom_dsp/arm/blend_a64_mask_neon.c
+++ b/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
index e4300c9920..e4300c9920 100644
--- a/third_party/aom/aom_dsp/arm/fwd_txfm_neon.c
+++ b/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
index c85b1e9100..c85b1e9100 100644
--- a/third_party/aom/aom_dsp/arm/intrapred_neon.c
+++ b/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
index bdc67626d6..bdc67626d6 100644
--- a/third_party/aom/aom_dsp/arm/loopfilter_neon.c
+++ b/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
index 606950ab25..606950ab25 100644
--- a/third_party/aom/aom_dsp/arm/sad4d_neon.c
+++ b/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
index a39de91d60..a39de91d60 100644
--- a/third_party/aom/aom_dsp/arm/sad_neon.c
+++ b/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
index cf618eee77..cf618eee77 100644
--- a/third_party/aom/aom_dsp/arm/subpel_variance_neon.c
+++ b/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
index 28f5ace8e1..28f5ace8e1 100644
--- a/third_party/aom/aom_dsp/arm/subtract_neon.c
+++ b/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
index 74385a6010..74385a6010 100644
--- a/third_party/aom/aom_dsp/arm/variance_neon.c
+++ b/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
index 01088010a1..01088010a1 100644
--- a/third_party/aom/aom_dsp/binary_codes_reader.c
+++ b/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
index 364a67469a..364a67469a 100644
--- a/third_party/aom/aom_dsp/binary_codes_reader.h
+++ b/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
index ee7a9f567e..ee7a9f567e 100644
--- a/third_party/aom/aom_dsp/binary_codes_writer.c
+++ b/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
index c360e0e298..c360e0e298 100644
--- a/third_party/aom/aom_dsp/binary_codes_writer.h
+++ b/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
index 7c0efcc785..7c0efcc785 100644
--- a/third_party/aom/aom_dsp/bitreader.h
+++ b/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
index b532117849..b532117849 100644
--- a/third_party/aom/aom_dsp/bitreader_buffer.c
+++ b/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
index 725ca1ea2b..725ca1ea2b 100644
--- a/third_party/aom/aom_dsp/bitreader_buffer.h
+++ b/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
index b5ecc2382b..b5ecc2382b 100644
--- a/third_party/aom/aom_dsp/bitwriter.h
+++ b/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
index 596246deb2..596246deb2 100644
--- a/third_party/aom/aom_dsp/bitwriter_buffer.c
+++ b/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
index d0311284f2..d0311284f2 100644
--- a/third_party/aom/aom_dsp/bitwriter_buffer.h
+++ b/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
index fd87dc1810..fd87dc1810 100644
--- a/third_party/aom/aom_dsp/blend.h
+++ b/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
index 0554b43d1a..0554b43d1a 100644
--- a/third_party/aom/aom_dsp/blend_a64_hmask.c
+++ b/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
index 992cc5c0c4..992cc5c0c4 100644
--- a/third_party/aom/aom_dsp/blend_a64_mask.c
+++ b/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
index 4f222e17f0..4f222e17f0 100644
--- a/third_party/aom/aom_dsp/blend_a64_vmask.c
+++ b/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
index f7703dffc6..f7703dffc6 100644
--- a/third_party/aom/aom_dsp/buf_ans.c
+++ b/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
index 985fcdf9e5..985fcdf9e5 100644
--- a/third_party/aom/aom_dsp/buf_ans.h
+++ b/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
index 6c2259f233..6c2259f233 100644
--- a/third_party/aom/aom_dsp/daalaboolreader.c
+++ b/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
index ba78f916d7..ba78f916d7 100644
--- a/third_party/aom/aom_dsp/daalaboolreader.h
+++ b/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
index b24ffbf3fe..b24ffbf3fe 100644
--- a/third_party/aom/aom_dsp/daalaboolwriter.c
+++ b/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
index 3848877ced..3848877ced 100644
--- a/third_party/aom/aom_dsp/daalaboolwriter.h
+++ b/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
index aad96c6fc6..aad96c6fc6 100644
--- a/third_party/aom/aom_dsp/entcode.c
+++ b/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
index 7ba2b1c392..7ba2b1c392 100644
--- a/third_party/aom/aom_dsp/entcode.h
+++ b/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
index d1764c47b1..d1764c47b1 100644
--- a/third_party/aom/aom_dsp/entdec.c
+++ b/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
index 283bf18315..283bf18315 100644
--- a/third_party/aom/aom_dsp/entdec.h
+++ b/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
index a61da263cb..a61da263cb 100644
--- a/third_party/aom/aom_dsp/entenc.c
+++ b/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
index 3551d42508..3551d42508 100644
--- a/third_party/aom/aom_dsp/entenc.h
+++ b/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
index 3804519b31..3804519b31 100644
--- a/third_party/aom/aom_dsp/fastssim.c
+++ b/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
index 0ba71cfb34..0ba71cfb34 100644
--- a/third_party/aom/aom_dsp/fft.c
+++ b/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
index 5137331aec..5137331aec 100644
--- a/third_party/aom/aom_dsp/fft_common.h
+++ b/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
index e50f951c17..e50f951c17 100644
--- a/third_party/aom/aom_dsp/fwd_txfm.c
+++ b/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
index b96e1c3190..b96e1c3190 100644
--- a/third_party/aom/aom_dsp/grain_synthesis.c
+++ b/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
index 7aee6f6f44..7aee6f6f44 100644
--- a/third_party/aom/aom_dsp/grain_synthesis.h
+++ b/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
index 0d6a73f558..0d6a73f558 100644
--- a/third_party/aom/aom_dsp/grain_table.c
+++ b/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
index a8ac50730e..a8ac50730e 100644
--- a/third_party/aom/aom_dsp/grain_table.h
+++ b/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
index c6aa6b207b..c6aa6b207b 100644
--- a/third_party/aom/aom_dsp/intrapred.c
+++ b/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
index 3ec62a86ef..3ec62a86ef 100644
--- a/third_party/aom/aom_dsp/intrapred_common.h
+++ b/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
index a3f261824f..a3f261824f 100644
--- a/third_party/aom/aom_dsp/loopfilter.c
+++ b/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
index 96d04cff0c..96d04cff0c 100644
--- a/third_party/aom/aom_dsp/mips/add_noise_msa.c
+++ b/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
index 363fad308d..363fad308d 100644
--- a/third_party/aom/aom_dsp/mips/aom_convolve8_horiz_msa.c
+++ b/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
index aa962b41f7..aa962b41f7 100644
--- a/third_party/aom/aom_dsp/mips/aom_convolve8_vert_msa.c
+++ b/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
index f7f116f4da..f7f116f4da 100644
--- a/third_party/aom/aom_dsp/mips/aom_convolve_copy_msa.c
+++ b/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
index 852415c201..852415c201 100644
--- a/third_party/aom/aom_dsp/mips/aom_convolve_msa.h
+++ b/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
index 00ab75dc31..00ab75dc31 100644
--- a/third_party/aom/aom_dsp/mips/common_dspr2.c
+++ b/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
index c42188d62d..c42188d62d 100644
--- a/third_party/aom/aom_dsp/mips/common_dspr2.h
+++ b/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
index 08bf1ab30f..08bf1ab30f 100644
--- a/third_party/aom/aom_dsp/mips/convolve2_dspr2.c
+++ b/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
index 097da73ca0..097da73ca0 100644
--- a/third_party/aom/aom_dsp/mips/convolve2_horiz_dspr2.c
+++ b/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
index 40abfd89eb..40abfd89eb 100644
--- a/third_party/aom/aom_dsp/mips/convolve2_vert_dspr2.c
+++ b/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
index af54b42647..af54b42647 100644
--- a/third_party/aom/aom_dsp/mips/convolve8_dspr2.c
+++ b/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
index f9c6879abd..f9c6879abd 100644
--- a/third_party/aom/aom_dsp/mips/convolve8_horiz_dspr2.c
+++ b/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
index 201e664279..201e664279 100644
--- a/third_party/aom/aom_dsp/mips/convolve8_vert_dspr2.c
+++ b/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
index e5d48a884d..e5d48a884d 100644
--- a/third_party/aom/aom_dsp/mips/convolve_common_dspr2.h
+++ b/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
index 7c221ae899..7c221ae899 100644
--- a/third_party/aom/aom_dsp/mips/intrapred16_dspr2.c
+++ b/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
index 0a21979c74..0a21979c74 100644
--- a/third_party/aom/aom_dsp/mips/intrapred4_dspr2.c
+++ b/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
index d42a77c802..d42a77c802 100644
--- a/third_party/aom/aom_dsp/mips/intrapred8_dspr2.c
+++ b/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
index 9f25cc1ca0..9f25cc1ca0 100644
--- a/third_party/aom/aom_dsp/mips/intrapred_msa.c
+++ b/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
index 38a10e9b22..38a10e9b22 100644
--- a/third_party/aom/aom_dsp/mips/loopfilter_16_msa.c
+++ b/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
index dc0a977645..dc0a977645 100644
--- a/third_party/aom/aom_dsp/mips/loopfilter_4_msa.c
+++ b/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
index dc203e79cf..dc203e79cf 100644
--- a/third_party/aom/aom_dsp/mips/loopfilter_8_msa.c
+++ b/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
index 8c41278beb..8c41278beb 100644
--- a/third_party/aom/aom_dsp/mips/loopfilter_filters_dspr2.c
+++ b/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
index 28f0dc35a3..28f0dc35a3 100644
--- a/third_party/aom/aom_dsp/mips/loopfilter_filters_dspr2.h
+++ b/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
index 62295d69dd..62295d69dd 100644
--- a/third_party/aom/aom_dsp/mips/loopfilter_macros_dspr2.h
+++ b/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
index a0f57f386a..a0f57f386a 100644
--- a/third_party/aom/aom_dsp/mips/loopfilter_masks_dspr2.h
+++ b/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
index b67ccfe9d8..b67ccfe9d8 100644
--- a/third_party/aom/aom_dsp/mips/loopfilter_mb_dspr2.c
+++ b/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
index 34733e42ef..34733e42ef 100644
--- a/third_party/aom/aom_dsp/mips/loopfilter_mb_horiz_dspr2.c
+++ b/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
index 3d3f1ec971..3d3f1ec971 100644
--- a/third_party/aom/aom_dsp/mips/loopfilter_mb_vert_dspr2.c
+++ b/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
index 54b0bb4bd9..54b0bb4bd9 100644
--- a/third_party/aom/aom_dsp/mips/loopfilter_msa.h
+++ b/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
index 9bfc27147b..9bfc27147b 100644
--- a/third_party/aom/aom_dsp/mips/macros_msa.h
+++ b/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
index 58cdd80d99..58cdd80d99 100644
--- a/third_party/aom/aom_dsp/mips/sad_msa.c
+++ b/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
index 810b6efaaa..810b6efaaa 100644
--- a/third_party/aom/aom_dsp/mips/sub_pixel_variance_msa.c
+++ b/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
index bfed773ac8..bfed773ac8 100644
--- a/third_party/aom/aom_dsp/mips/subtract_msa.c
+++ b/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
index 065c09ac55..065c09ac55 100644
--- a/third_party/aom/aom_dsp/mips/variance_msa.c
+++ b/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
index 2faee85063..2faee85063 100644
--- a/third_party/aom/aom_dsp/noise_model.c
+++ b/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
index 049d5be151..049d5be151 100644
--- a/third_party/aom/aom_dsp/noise_model.h
+++ b/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
index 87e8e9fecc..87e8e9fecc 100644
--- a/third_party/aom/aom_dsp/noise_util.c
+++ b/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
index 2284a171a4..2284a171a4 100644
--- a/third_party/aom/aom_dsp/noise_util.h
+++ b/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
index f3d87f2642..f3d87f2642 100644
--- a/third_party/aom/aom_dsp/postproc.h
+++ b/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
index d003a986e6..d003a986e6 100644
--- a/third_party/aom/aom_dsp/prob.h
+++ b/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
index 50f376a4a1..50f376a4a1 100644
--- a/third_party/aom/aom_dsp/psnr.c
+++ b/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
index 58e4e71ee7..58e4e71ee7 100644
--- a/third_party/aom/aom_dsp/psnr.h
+++ b/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
index 30fe21d9ce..30fe21d9ce 100644
--- a/third_party/aom/aom_dsp/psnrhvs.c
+++ b/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
index 62dbd86a92..62dbd86a92 100644
--- a/third_party/aom/aom_dsp/quantize.c
+++ b/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
index c55ab234e7..c55ab234e7 100644
--- a/third_party/aom/aom_dsp/quantize.h
+++ b/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
index 1e24df4a56..1e24df4a56 100644
--- a/third_party/aom/aom_dsp/sad.c
+++ b/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
index c176001d64..c176001d64 100644
--- a/third_party/aom/aom_dsp/sad_av1.c
+++ b/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
index 01dbb8fd27..01dbb8fd27 100644
--- a/third_party/aom/aom_dsp/simd/v128_intrinsics.h
+++ b/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
index 3c669d5792..3c669d5792 100644
--- a/third_party/aom/aom_dsp/simd/v128_intrinsics_arm.h
+++ b/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
index bbe9a9d281..bbe9a9d281 100644
--- a/third_party/aom/aom_dsp/simd/v128_intrinsics_c.h
+++ b/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
index 6c7241ff4f..6c7241ff4f 100644
--- a/third_party/aom/aom_dsp/simd/v128_intrinsics_x86.h
+++ b/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
index cb99d35b71..cb99d35b71 100644
--- a/third_party/aom/aom_dsp/simd/v256_intrinsics.h
+++ b/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
index bd86ea1721..bd86ea1721 100644
--- a/third_party/aom/aom_dsp/simd/v256_intrinsics_arm.h
+++ b/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
index a1c08e95ad..a1c08e95ad 100644
--- a/third_party/aom/aom_dsp/simd/v256_intrinsics_c.h
+++ b/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
index d5b7905eff..d5b7905eff 100644
--- a/third_party/aom/aom_dsp/simd/v256_intrinsics_v128.h
+++ b/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
index 44594bc41c..44594bc41c 100644
--- a/third_party/aom/aom_dsp/simd/v256_intrinsics_x86.h
+++ b/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
index afc55428d8..afc55428d8 100644
--- a/third_party/aom/aom_dsp/simd/v64_intrinsics.h
+++ b/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
index 8f39ad6e81..8f39ad6e81 100644
--- a/third_party/aom/aom_dsp/simd/v64_intrinsics_arm.h
+++ b/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
index 028d68c4f7..028d68c4f7 100644
--- a/third_party/aom/aom_dsp/simd/v64_intrinsics_c.h
+++ b/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
index 5f9a57b379..5f9a57b379 100644
--- a/third_party/aom/aom_dsp/simd/v64_intrinsics_x86.h
+++ b/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
index 2493948079..2493948079 100644
--- a/third_party/aom/aom_dsp/sse.c
+++ b/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
index 681770ba97..681770ba97 100644
--- a/third_party/aom/aom_dsp/ssim.c
+++ b/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
index 55038f4c22..55038f4c22 100644
--- a/third_party/aom/aom_dsp/ssim.h
+++ b/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
index 2f6da96e59..2f6da96e59 100644
--- a/third_party/aom/aom_dsp/subtract.c
+++ b/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
index 44ec41f2ed..44ec41f2ed 100644
--- a/third_party/aom/aom_dsp/sum_squares.c
+++ b/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
index f98242840c..f98242840c 100644
--- a/third_party/aom/aom_dsp/txfm_common.h
+++ b/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
index 23b7153098..23b7153098 100644
--- a/third_party/aom/aom_dsp/variance.c
+++ b/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
index 362da29d33..362da29d33 100644
--- a/third_party/aom/aom_dsp/variance.h
+++ b/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
index 5f5bf5f14e..5f5bf5f14e 100644
--- a/third_party/aom/aom_dsp/x86/aom_asm_stubs.c
+++ b/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
index 7283c32b8c..7283c32b8c 100644
--- a/third_party/aom/aom_dsp/x86/aom_convolve_copy_sse2.asm
+++ b/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
index b6f040791a..b6f040791a 100644
--- 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
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
index 7b3fe6419a..7b3fe6419a 100644
--- 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
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
index 94b5da1714..94b5da1714 100644
--- 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
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
index 325a21b761..325a21b761 100644
--- 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
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
index c88fc9ffb2..c88fc9ffb2 100644
--- a/third_party/aom/aom_dsp/x86/aom_subpixel_8t_sse2.asm
+++ b/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
index 3ca7921b66..3ca7921b66 100644
--- a/third_party/aom/aom_dsp/x86/aom_subpixel_8t_ssse3.asm
+++ b/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
index d0b4b2839e..d0b4b2839e 100644
--- a/third_party/aom/aom_dsp/x86/aom_subpixel_bilinear_sse2.asm
+++ b/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
index 59edc49a9b..59edc49a9b 100644
--- a/third_party/aom/aom_dsp/x86/aom_subpixel_bilinear_ssse3.asm
+++ b/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
index 4f5e3f8c1b..4f5e3f8c1b 100644
--- a/third_party/aom/aom_dsp/x86/blend_a64_hmask_sse4.c
+++ b/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
index 67fb4d32bd..67fb4d32bd 100644
--- a/third_party/aom/aom_dsp/x86/blend_a64_mask_avx2.c
+++ b/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
index 9d6b4c2f74..9d6b4c2f74 100644
--- a/third_party/aom/aom_dsp/x86/blend_a64_mask_sse4.c
+++ b/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
index 0649102325..0649102325 100644
--- a/third_party/aom/aom_dsp/x86/blend_a64_vmask_sse4.c
+++ b/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
index c071fdcfc4..c071fdcfc4 100644
--- a/third_party/aom/aom_dsp/x86/blend_mask_sse4.h
+++ b/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
index 8d9b325101..8d9b325101 100644
--- a/third_party/aom/aom_dsp/x86/blend_sse4.h
+++ b/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
index 96fe4ebb67..96fe4ebb67 100644
--- a/third_party/aom/aom_dsp/x86/common_avx2.h
+++ b/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
index 3e19682cd9..3e19682cd9 100644
--- a/third_party/aom/aom_dsp/x86/convolve.h
+++ b/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
index 30253f65c2..30253f65c2 100644
--- a/third_party/aom/aom_dsp/x86/convolve_avx2.h
+++ b/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
index 707bd2d782..707bd2d782 100644
--- a/third_party/aom/aom_dsp/x86/convolve_common_intrin.h
+++ b/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
index 445d04b103..445d04b103 100644
--- a/third_party/aom/aom_dsp/x86/convolve_sse2.h
+++ b/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
index 6b8388d84a..6b8388d84a 100644
--- a/third_party/aom/aom_dsp/x86/convolve_sse4_1.h
+++ b/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
index 54da022538..54da022538 100644
--- a/third_party/aom/aom_dsp/x86/fft_avx2.c
+++ b/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
index 12bdc3e185..12bdc3e185 100644
--- a/third_party/aom/aom_dsp/x86/fft_sse2.c
+++ b/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
index 1e3d13ec85..1e3d13ec85 100644
--- a/third_party/aom/aom_dsp/x86/fwd_txfm_impl_sse2.h
+++ b/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
index 2d8f8f71e4..2d8f8f71e4 100644
--- a/third_party/aom/aom_dsp/x86/fwd_txfm_sse2.c
+++ b/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
index 260d8dd58e..260d8dd58e 100644
--- a/third_party/aom/aom_dsp/x86/fwd_txfm_sse2.h
+++ b/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
index c1fb259a11..c1fb259a11 100644
--- 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
diff --git a/third_party/aom/aom_dsp/x86/highbd_convolve_avx2.c b/media/libaom/src/aom_dsp/x86/highbd_convolve_avx2.c
index 099fcf7fc6..099fcf7fc6 100644
--- a/third_party/aom/aom_dsp/x86/highbd_convolve_avx2.c
+++ b/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
index e7b33d1c46..e7b33d1c46 100644
--- a/third_party/aom/aom_dsp/x86/highbd_convolve_ssse3.c
+++ b/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
index 5a55736c48..5a55736c48 100644
--- a/third_party/aom/aom_dsp/x86/highbd_intrapred_sse2.c
+++ b/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
index 91b3d126ca..91b3d126ca 100644
--- a/third_party/aom/aom_dsp/x86/highbd_intrapred_sse2_asm.asm
+++ b/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
index c954da94e5..c954da94e5 100644
--- a/third_party/aom/aom_dsp/x86/highbd_loopfilter_avx2.c
+++ b/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
index 097e0778ff..097e0778ff 100644
--- a/third_party/aom/aom_dsp/x86/highbd_loopfilter_sse2.c
+++ b/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
index b9689202a0..b9689202a0 100644
--- a/third_party/aom/aom_dsp/x86/highbd_quantize_intrin_avx2.c
+++ b/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
index 58e5f98e58..58e5f98e58 100644
--- a/third_party/aom/aom_dsp/x86/highbd_quantize_intrin_sse2.c
+++ b/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
index e0d22522d2..e0d22522d2 100644
--- a/third_party/aom/aom_dsp/x86/highbd_sad4d_sse2.asm
+++ b/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
index 3398d8a2ae..3398d8a2ae 100644
--- a/third_party/aom/aom_dsp/x86/highbd_sad_sse2.asm
+++ b/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
index 61f5b8e865..61f5b8e865 100644
--- 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
diff --git a/third_party/aom/aom_dsp/x86/highbd_subtract_sse2.c b/media/libaom/src/aom_dsp/x86/highbd_subtract_sse2.c
index 18eb03d12c..18eb03d12c 100644
--- a/third_party/aom/aom_dsp/x86/highbd_subtract_sse2.c
+++ b/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
index 9b1b4c9de7..9b1b4c9de7 100644
--- a/third_party/aom/aom_dsp/x86/highbd_variance_avx2.c
+++ b/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
index 0d954e1788..0d954e1788 100644
--- a/third_party/aom/aom_dsp/x86/highbd_variance_impl_sse2.asm
+++ b/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
index 47b052abc9..47b052abc9 100644
--- a/third_party/aom/aom_dsp/x86/highbd_variance_sse2.c
+++ b/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
index df5449a9df..df5449a9df 100644
--- a/third_party/aom/aom_dsp/x86/highbd_variance_sse4.c
+++ b/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
index 1e67d392e8..1e67d392e8 100644
--- a/third_party/aom/aom_dsp/x86/intrapred_avx2.c
+++ b/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
index 5b2452c8eb..5b2452c8eb 100644
--- a/third_party/aom/aom_dsp/x86/intrapred_sse2.c
+++ b/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
index 9aece27beb..9aece27beb 100644
--- a/third_party/aom/aom_dsp/x86/intrapred_sse2_asm.asm
+++ b/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
index 807ed1770f..807ed1770f 100644
--- a/third_party/aom/aom_dsp/x86/intrapred_ssse3.c
+++ b/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
index 0bc841a7a4..0bc841a7a4 100644
--- a/third_party/aom/aom_dsp/x86/inv_wht_sse2.asm
+++ b/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
index c3c88245a4..c3c88245a4 100644
--- a/third_party/aom/aom_dsp/x86/jnt_sad_ssse3.c
+++ b/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
index f9a41a210b..f9a41a210b 100644
--- a/third_party/aom/aom_dsp/x86/jnt_variance_ssse3.c
+++ b/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
index 9d88b5e493..9d88b5e493 100644
--- a/third_party/aom/aom_dsp/x86/loopfilter_sse2.c
+++ b/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
index 8970fe7dd6..8970fe7dd6 100644
--- a/third_party/aom/aom_dsp/x86/lpf_common_sse2.h
+++ b/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
index 584b5e7e37..584b5e7e37 100644
--- a/third_party/aom/aom_dsp/x86/masked_sad_intrin_avx2.c
+++ b/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
index 493f9bd8f2..493f9bd8f2 100644
--- a/third_party/aom/aom_dsp/x86/masked_sad_intrin_ssse3.c
+++ b/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
index cffbd9672c..cffbd9672c 100644
--- a/third_party/aom/aom_dsp/x86/masked_sad_intrin_ssse3.h
+++ b/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
index d7dbefd7d9..d7dbefd7d9 100644
--- a/third_party/aom/aom_dsp/x86/masked_variance_intrin_ssse3.c
+++ b/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
index 4faa098ace..4faa098ace 100644
--- a/third_party/aom/aom_dsp/x86/masked_variance_intrin_ssse3.h
+++ b/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
index 6c821673e8..6c821673e8 100644
--- a/third_party/aom/aom_dsp/x86/mem_sse2.h
+++ b/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
index 5181e444c0..5181e444c0 100644
--- a/third_party/aom/aom_dsp/x86/obmc_intrinsic_sse4.h
+++ b/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
index 48486c6c4c..48486c6c4c 100644
--- a/third_party/aom/aom_dsp/x86/obmc_intrinsic_ssse3.h
+++ b/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
index 2aa2a05551..2aa2a05551 100644
--- a/third_party/aom/aom_dsp/x86/obmc_sad_avx2.c
+++ b/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
index 0338a8c777..0338a8c777 100644
--- a/third_party/aom/aom_dsp/x86/obmc_sad_sse4.c
+++ b/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
index bfec0e8a84..bfec0e8a84 100644
--- a/third_party/aom/aom_dsp/x86/obmc_variance_avx2.c
+++ b/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
index 72eda0e578..72eda0e578 100644
--- a/third_party/aom/aom_dsp/x86/obmc_variance_sse4.c
+++ b/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
index 216a0bd8f9..216a0bd8f9 100644
--- a/third_party/aom/aom_dsp/x86/quantize_avx_x86_64.asm
+++ b/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
index d3de6e24db..d3de6e24db 100644
--- a/third_party/aom/aom_dsp/x86/quantize_sse2.c
+++ b/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
index 39d4ca674c..39d4ca674c 100644
--- a/third_party/aom/aom_dsp/x86/quantize_ssse3_x86_64.asm
+++ b/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
index 4eed7dd29a..4eed7dd29a 100644
--- a/third_party/aom/aom_dsp/x86/quantize_x86.h
+++ b/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
index f662b62b16..f662b62b16 100644
--- a/third_party/aom/aom_dsp/x86/sad4d_avx2.c
+++ b/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
index 55a856985a..55a856985a 100644
--- a/third_party/aom/aom_dsp/x86/sad4d_sse2.asm
+++ b/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
index a50dba64a1..a50dba64a1 100644
--- a/third_party/aom/aom_dsp/x86/sad_avx2.c
+++ b/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
index b506d46639..b506d46639 100644
--- a/third_party/aom/aom_dsp/x86/sad_highbd_avx2.c
+++ b/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
index c6fd62c9e2..c6fd62c9e2 100644
--- a/third_party/aom/aom_dsp/x86/sad_impl_avx2.c
+++ b/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
index 3251b76559..3251b76559 100644
--- a/third_party/aom/aom_dsp/x86/sad_sse2.asm
+++ b/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
index 305dde5c08..305dde5c08 100644
--- a/third_party/aom/aom_dsp/x86/sse_avx2.c
+++ b/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
index 8b5af84691..8b5af84691 100644
--- a/third_party/aom/aom_dsp/x86/sse_sse4.c
+++ b/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
index 6d9b5a12f1..6d9b5a12f1 100644
--- a/third_party/aom/aom_dsp/x86/ssim_opt_x86_64.asm
+++ b/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
index 45bf6ec3c5..45bf6ec3c5 100644
--- a/third_party/aom/aom_dsp/x86/subpel_variance_sse2.asm
+++ b/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
index 4389d123db..4389d123db 100644
--- a/third_party/aom/aom_dsp/x86/subtract_avx2.c
+++ b/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
index 1a75a234f9..1a75a234f9 100644
--- a/third_party/aom/aom_dsp/x86/subtract_sse2.asm
+++ b/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
index 0af44e3a4c..0af44e3a4c 100644
--- a/third_party/aom/aom_dsp/x86/sum_squares_avx2.c
+++ b/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
index 22d7739ec4..22d7739ec4 100644
--- a/third_party/aom/aom_dsp/x86/sum_squares_sse2.c
+++ b/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
index 491e31cc5e..491e31cc5e 100644
--- a/third_party/aom/aom_dsp/x86/sum_squares_sse2.h
+++ b/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
index 1e9f1e27b8..1e9f1e27b8 100644
--- a/third_party/aom/aom_dsp/x86/synonyms.h
+++ b/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
index 3f69b120ea..3f69b120ea 100644
--- a/third_party/aom/aom_dsp/x86/synonyms_avx2.h
+++ b/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
index d0d1ee6845..d0d1ee6845 100644
--- a/third_party/aom/aom_dsp/x86/transpose_sse2.h
+++ b/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
index b1611ba870..b1611ba870 100644
--- a/third_party/aom/aom_dsp/x86/txfm_common_avx2.h
+++ b/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
index ed82eee962..ed82eee962 100644
--- a/third_party/aom/aom_dsp/x86/txfm_common_sse2.h
+++ b/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
index 800aef1266..800aef1266 100644
--- a/third_party/aom/aom_dsp/x86/variance_avx2.c
+++ b/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
index 88e27aef3a..88e27aef3a 100644
--- a/third_party/aom/aom_dsp/x86/variance_impl_avx2.c
+++ b/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
index 66b0d7d845..66b0d7d845 100644
--- a/third_party/aom/aom_dsp/x86/variance_impl_ssse3.c
+++ b/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
index 3c37e77c06..3c37e77c06 100644
--- a/third_party/aom/aom_dsp/x86/variance_sse2.c
+++ b/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
index e603fc5bfb..e603fc5bfb 100644
--- a/third_party/aom/aom_mem/aom_mem.c
+++ b/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
index eaee8440b8..eaee8440b8 100644
--- a/third_party/aom/aom_mem/aom_mem.cmake
+++ b/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
index 4b1fa45f19..4b1fa45f19 100644
--- a/third_party/aom/aom_mem/aom_mem.h
+++ b/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
index cbc30a9bbb..cbc30a9bbb 100644
--- a/third_party/aom/aom_mem/include/aom_mem_intrnl.h
+++ b/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
index 4d77aac5a1..4d77aac5a1 100644
--- a/third_party/aom/aom_ports/aom_once.h
+++ b/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
index 6272fc0e36..6272fc0e36 100644
--- a/third_party/aom/aom_ports/aom_ports.cmake
+++ b/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
index 9b17b89838..9b17b89838 100644
--- a/third_party/aom/aom_ports/aom_timer.h
+++ b/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
index cb1fb9becd..cb1fb9becd 100644
--- a/third_party/aom/aom_ports/arm.h
+++ b/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
index 5a75bb3484..5a75bb3484 100644
--- a/third_party/aom/aom_ports/arm_cpudetect.c
+++ b/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
index 44df173070..44df173070 100644
--- a/third_party/aom/aom_ports/bitops.h
+++ b/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
index 85d218a3d2..85d218a3d2 100644
--- a/third_party/aom/aom_ports/emmintrin_compat.h
+++ b/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
index 90776bacb3..90776bacb3 100644
--- a/third_party/aom/aom_ports/emms.asm
+++ b/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
index 3ffea3cd6d..3ffea3cd6d 100644
--- a/third_party/aom/aom_ports/mem.h
+++ b/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
index 2b5bc0f0fb..2b5bc0f0fb 100644
--- a/third_party/aom/aom_ports/mem_ops.h
+++ b/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
index 37c3675318..37c3675318 100644
--- a/third_party/aom/aom_ports/mem_ops_aligned.h
+++ b/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
index e78e605f2f..e78e605f2f 100644
--- a/third_party/aom/aom_ports/msvc.h
+++ b/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
index 3159bda682..3159bda682 100644
--- a/third_party/aom/aom_ports/ppc.h
+++ b/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
index 82b4f58ccc..82b4f58ccc 100644
--- a/third_party/aom/aom_ports/ppc_cpudetect.c
+++ b/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
index 1dd8eb4cf4..1dd8eb4cf4 100644
--- a/third_party/aom/aom_ports/sanitizer.h
+++ b/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
index 6640839d82..6640839d82 100644
--- a/third_party/aom/aom_ports/system_state.h
+++ b/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
index 52ee49cb3c..52ee49cb3c 100644
--- a/third_party/aom/aom_ports/x86.h
+++ b/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
index 0e7c262873..0e7c262873 100644
--- a/third_party/aom/aom_ports/x86_abi_support.asm
+++ b/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
index 197dea6bd2..197dea6bd2 100644
--- a/third_party/aom/aom_scale/aom_scale.cmake
+++ b/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
index 11812a1453..11812a1453 100644
--- a/third_party/aom/aom_scale/aom_scale.h
+++ b/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
index a04e053b0a..a04e053b0a 100644
--- a/third_party/aom/aom_scale/aom_scale_rtcd.c
+++ b/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
index c5990b1bb3..c5990b1bb3 100644
--- a/third_party/aom/aom_scale/aom_scale_rtcd.pl
+++ b/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
index 206c42c9f5..206c42c9f5 100644
--- a/third_party/aom/aom_scale/generic/aom_scale.c
+++ b/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
index 549e2aa690..549e2aa690 100644
--- a/third_party/aom/aom_scale/generic/gen_scalers.c
+++ b/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
index 84705e2d8b..84705e2d8b 100644
--- a/third_party/aom/aom_scale/generic/yv12config.c
+++ b/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
index ba183520a0..ba183520a0 100644
--- a/third_party/aom/aom_scale/generic/yv12extend.c
+++ b/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
index 869e594d79..869e594d79 100644
--- a/third_party/aom/aom_scale/mips/dspr2/yv12extend_dspr2.c
+++ b/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
index 2fb81acd7c..2fb81acd7c 100644
--- a/third_party/aom/aom_scale/yv12config.h
+++ b/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
index cae9f5e250..cae9f5e250 100644
--- a/third_party/aom/aom_util/aom_thread.c
+++ b/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
index f14c1ac18c..f14c1ac18c 100644
--- a/third_party/aom/aom_util/aom_thread.h
+++ b/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
index d4f3bce74d..d4f3bce74d 100644
--- a/third_party/aom/aom_util/aom_util.cmake
+++ b/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
index 468c47ed14..468c47ed14 100644
--- a/third_party/aom/aom_util/debug_util.c
+++ b/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
index 127a8b468a..127a8b468a 100644
--- a/third_party/aom/aom_util/debug_util.h
+++ b/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
index f536ec5b8a..f536ec5b8a 100644
--- a/third_party/aom/aom_util/endian_inl.h
+++ b/media/libaom/src/aom_util/endian_inl.h
diff --git a/third_party/aom/apps/aomdec.c b/media/libaom/src/apps/aomdec.c
index ff13b6f500..ff13b6f500 100644
--- a/third_party/aom/apps/aomdec.c
+++ b/media/libaom/src/apps/aomdec.c
diff --git a/third_party/aom/apps/aomenc.c b/media/libaom/src/apps/aomenc.c
index 2e5d35cfef..2e5d35cfef 100644
--- a/third_party/aom/apps/aomenc.c
+++ b/media/libaom/src/apps/aomenc.c
diff --git a/third_party/aom/apps/aomenc.h b/media/libaom/src/apps/aomenc.h
index 7c23df0068..7c23df0068 100644
--- a/third_party/aom/apps/aomenc.h
+++ b/media/libaom/src/apps/aomenc.h
diff --git a/third_party/aom/av1/av1.cmake b/media/libaom/src/av1/av1.cmake
index 3a7cd7ee13..3a7cd7ee13 100644
--- a/third_party/aom/av1/av1.cmake
+++ b/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
index 3295f618aa..3295f618aa 100644
--- a/third_party/aom/av1/av1_cx_iface.c
+++ b/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
index 4a66310471..4a66310471 100644
--- a/third_party/aom/av1/av1_dx_iface.c
+++ b/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
index 4a7af580b8..4a7af580b8 100644
--- a/third_party/aom/av1/av1_iface_common.h
+++ b/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
index 1bf81c91d4..1bf81c91d4 100644
--- a/third_party/aom/av1/common/alloccommon.c
+++ b/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
index 8e58969814..8e58969814 100644
--- a/third_party/aom/av1/common/alloccommon.h
+++ b/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
index bad411743d..bad411743d 100644
--- a/third_party/aom/av1/common/arm/av1_inv_txfm_neon.c
+++ b/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
index 9ec658291c..9ec658291c 100644
--- a/third_party/aom/av1/common/arm/av1_inv_txfm_neon.h
+++ b/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
index de3c547248..de3c547248 100644
--- a/third_party/aom/av1/common/arm/av1_txfm_neon.c
+++ b/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
index 7134f183e3..7134f183e3 100644
--- a/third_party/aom/av1/common/arm/blend_a64_hmask_neon.c
+++ b/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
index 194e94c8c0..194e94c8c0 100644
--- a/third_party/aom/av1/common/arm/blend_a64_vmask_neon.c
+++ b/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
index 39025b5e54..39025b5e54 100644
--- a/third_party/aom/av1/common/arm/cfl_neon.c
+++ b/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
index d0c4f8ff67..d0c4f8ff67 100644
--- a/third_party/aom/av1/common/arm/convolve_neon.c
+++ b/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
index f382984f27..f382984f27 100644
--- a/third_party/aom/av1/common/arm/convolve_neon.h
+++ b/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
index e5674ef7c2..e5674ef7c2 100644
--- a/third_party/aom/av1/common/arm/jnt_convolve_neon.c
+++ b/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
index c4ae2e7849..c4ae2e7849 100644
--- a/third_party/aom/av1/common/arm/mem_neon.h
+++ b/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
index 44e064195e..44e064195e 100644
--- a/third_party/aom/av1/common/arm/reconinter_neon.c
+++ b/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
index b3a37c4cb8..b3a37c4cb8 100644
--- a/third_party/aom/av1/common/arm/selfguided_neon.c
+++ b/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
index 8a3d9f07ff..8a3d9f07ff 100644
--- a/third_party/aom/av1/common/arm/transpose_neon.h
+++ b/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
index 7f02d42a73..7f02d42a73 100644
--- a/third_party/aom/av1/common/arm/warp_plane_neon.c
+++ b/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
index a9bb5bcf00..a9bb5bcf00 100644
--- a/third_party/aom/av1/common/arm/wiener_convolve_neon.c
+++ b/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
index 7ef2d6d7fa..7ef2d6d7fa 100644
--- a/third_party/aom/av1/common/av1_inv_txfm1d.c
+++ b/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
index c31c019aa9..c31c019aa9 100644
--- a/third_party/aom/av1/common/av1_inv_txfm1d.h
+++ b/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
index 7d80a00996..7d80a00996 100644
--- a/third_party/aom/av1/common/av1_inv_txfm1d_cfg.h
+++ b/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
index 4e69443145..4e69443145 100644
--- a/third_party/aom/av1/common/av1_inv_txfm2d.c
+++ b/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
index 537d8dfe92..537d8dfe92 100644
--- a/third_party/aom/av1/common/av1_loopfilter.c
+++ b/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
index 80ac611781..80ac611781 100644
--- a/third_party/aom/av1/common/av1_loopfilter.h
+++ b/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
index a77a4d2541..a77a4d2541 100644
--- a/third_party/aom/av1/common/av1_rtcd.c
+++ b/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
index dee1f1c79b..dee1f1c79b 100755..100644
--- a/third_party/aom/av1/common/av1_rtcd_defs.pl
+++ b/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
index bb70eab703..bb70eab703 100644
--- a/third_party/aom/av1/common/av1_txfm.c
+++ b/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
index 59d64ca4af..59d64ca4af 100644
--- a/third_party/aom/av1/common/av1_txfm.h
+++ b/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
index 2e796b6560..2e796b6560 100644
--- a/third_party/aom/av1/common/blockd.c
+++ b/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
index a2311c1b00..a2311c1b00 100644
--- a/third_party/aom/av1/common/blockd.h
+++ b/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
index e9e2b0e42c..e9e2b0e42c 100644
--- a/third_party/aom/av1/common/cdef.c
+++ b/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
index 3b2eac8a5c..3b2eac8a5c 100644
--- a/third_party/aom/av1/common/cdef.h
+++ b/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
index df1de89be3..df1de89be3 100644
--- a/third_party/aom/av1/common/cdef_block.c
+++ b/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
index 6b4452cd64..6b4452cd64 100644
--- a/third_party/aom/av1/common/cdef_block.h
+++ b/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
index e2b85b3e28..e2b85b3e28 100644
--- a/third_party/aom/av1/common/cdef_block_avx2.c
+++ b/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
index 2d6bc65e31..2d6bc65e31 100644
--- a/third_party/aom/av1/common/cdef_block_neon.c
+++ b/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
index 14587a023a..14587a023a 100644
--- a/third_party/aom/av1/common/cdef_block_simd.h
+++ b/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
index 73f115d17c..73f115d17c 100644
--- a/third_party/aom/av1/common/cdef_block_sse2.c
+++ b/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
index 349329af64..349329af64 100644
--- a/third_party/aom/av1/common/cdef_block_sse4.c
+++ b/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
index 3a93b150f3..3a93b150f3 100644
--- a/third_party/aom/av1/common/cdef_block_ssse3.c
+++ b/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
index ccc59b4eb7..ccc59b4eb7 100644
--- a/third_party/aom/av1/common/cfl.c
+++ b/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
index d627891bf5..d627891bf5 100644
--- a/third_party/aom/av1/common/cfl.h
+++ b/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
index bed6083db2..bed6083db2 100644
--- a/third_party/aom/av1/common/common.h
+++ b/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
index 46e455fdb1..46e455fdb1 100644
--- a/third_party/aom/av1/common/common_data.h
+++ b/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
index 1f11126fc3..1f11126fc3 100644
--- a/third_party/aom/av1/common/convolve.c
+++ b/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
index 4109dd8433..4109dd8433 100644
--- a/third_party/aom/av1/common/convolve.h
+++ b/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
index 868f341b5b..868f341b5b 100644
--- a/third_party/aom/av1/common/debugmodes.c
+++ b/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
index 4f95ef69b0..4f95ef69b0 100644
--- a/third_party/aom/av1/common/entropy.c
+++ b/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
index 991692c2f0..991692c2f0 100644
--- a/third_party/aom/av1/common/entropy.h
+++ b/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
index 41dc30ddb8..41dc30ddb8 100644
--- a/third_party/aom/av1/common/entropymode.c
+++ b/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
index 7047f34d2b..7047f34d2b 100644
--- a/third_party/aom/av1/common/entropymode.h
+++ b/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
index 4913373875..4913373875 100644
--- a/third_party/aom/av1/common/entropymv.c
+++ b/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
index fa818a2c16..fa818a2c16 100644
--- a/third_party/aom/av1/common/entropymv.h
+++ b/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
index 869c06ef2f..869c06ef2f 100644
--- a/third_party/aom/av1/common/enums.h
+++ b/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
index 571422d114..571422d114 100644
--- a/third_party/aom/av1/common/filter.h
+++ b/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
index fd6c4bc799..fd6c4bc799 100644
--- a/third_party/aom/av1/common/frame_buffers.c
+++ b/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
index 16188e51c7..16188e51c7 100644
--- a/third_party/aom/av1/common/frame_buffers.h
+++ b/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
index 2c1cb98271..2c1cb98271 100644
--- a/third_party/aom/av1/common/idct.c
+++ b/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
index d9454e73fe..d9454e73fe 100644
--- a/third_party/aom/av1/common/idct.h
+++ b/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
index 5b0225192a..5b0225192a 100644
--- a/third_party/aom/av1/common/mv.h
+++ b/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
index 7f24ab4e6d..7f24ab4e6d 100644
--- a/third_party/aom/av1/common/mvref_common.c
+++ b/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
index 83f7a1ac0d..83f7a1ac0d 100644
--- a/third_party/aom/av1/common/mvref_common.h
+++ b/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
index 1c90cd93fc..1c90cd93fc 100644
--- a/third_party/aom/av1/common/obmc.h
+++ b/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
index 823b700b13..823b700b13 100644
--- a/third_party/aom/av1/common/obu_util.c
+++ b/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
index 7c56904c84..7c56904c84 100644
--- a/third_party/aom/av1/common/obu_util.h
+++ b/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
index 7584b2e52f..7584b2e52f 100644
--- a/third_party/aom/av1/common/odintrin.c
+++ b/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
index e1db0f44d8..e1db0f44d8 100644
--- a/third_party/aom/av1/common/odintrin.h
+++ b/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
index ff011c89e9..ff011c89e9 100644
--- a/third_party/aom/av1/common/onyxc_int.h
+++ b/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
index 026a078095..026a078095 100644
--- a/third_party/aom/av1/common/ppc/cfl_ppc.c
+++ b/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
index 5952441d1f..5952441d1f 100644
--- a/third_party/aom/av1/common/pred_common.c
+++ b/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
index 6dba2322d6..6dba2322d6 100644
--- a/third_party/aom/av1/common/pred_common.h
+++ b/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
index 0e14da7a38..0e14da7a38 100644
--- a/third_party/aom/av1/common/quant_common.c
+++ b/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
index d1f52a660b..d1f52a660b 100644
--- a/third_party/aom/av1/common/quant_common.h
+++ b/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
index 3203efce4b..3203efce4b 100644
--- a/third_party/aom/av1/common/reconinter.c
+++ b/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
index db86c777e3..db86c777e3 100644
--- a/third_party/aom/av1/common/reconinter.h
+++ b/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
index 71a52e73e5..71a52e73e5 100644
--- a/third_party/aom/av1/common/reconintra.c
+++ b/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
index 07853aba01..07853aba01 100644
--- a/third_party/aom/av1/common/reconintra.h
+++ b/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
index d61a20aa2d..d61a20aa2d 100644
--- a/third_party/aom/av1/common/resize.c
+++ b/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
index 9a59a8d63b..9a59a8d63b 100644
--- a/third_party/aom/av1/common/resize.h
+++ b/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
index d276a915b5..d276a915b5 100644
--- a/third_party/aom/av1/common/restoration.c
+++ b/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
index d834f9270f..d834f9270f 100644
--- a/third_party/aom/av1/common/restoration.h
+++ b/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
index c525fe2296..c525fe2296 100644
--- a/third_party/aom/av1/common/scale.c
+++ b/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
index 748e958c35..748e958c35 100644
--- a/third_party/aom/av1/common/scale.h
+++ b/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
index 31a787b537..31a787b537 100644
--- a/third_party/aom/av1/common/scan.c
+++ b/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
index 233dc0efa2..233dc0efa2 100644
--- a/third_party/aom/av1/common/scan.h
+++ b/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
index cd189ad769..cd189ad769 100644
--- a/third_party/aom/av1/common/seg_common.c
+++ b/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
index 8c35bba86c..8c35bba86c 100644
--- a/third_party/aom/av1/common/seg_common.h
+++ b/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
index 8df4c9a09d..8df4c9a09d 100644
--- a/third_party/aom/av1/common/thread_common.c
+++ b/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
index 23d61d72a3..23d61d72a3 100644
--- a/third_party/aom/av1/common/thread_common.h
+++ b/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
index 1b413487f0..1b413487f0 100644
--- a/third_party/aom/av1/common/tile_common.c
+++ b/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
index c03553dc6f..c03553dc6f 100644
--- a/third_party/aom/av1/common/tile_common.h
+++ b/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
index 49dbde78fb..49dbde78fb 100644
--- a/third_party/aom/av1/common/timing.c
+++ b/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
index 06939ae43a..06939ae43a 100644
--- a/third_party/aom/av1/common/timing.h
+++ b/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
index 53e956450b..53e956450b 100644
--- a/third_party/aom/av1/common/token_cdfs.h
+++ b/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
index c96d37cca7..c96d37cca7 100644
--- a/third_party/aom/av1/common/txb_common.c
+++ b/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
index 1dda51f8b4..1dda51f8b4 100644
--- a/third_party/aom/av1/common/txb_common.h
+++ b/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
index 4144c43896..4144c43896 100644
--- a/third_party/aom/av1/common/warped_motion.c
+++ b/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
index a1a4f067dc..a1a4f067dc 100644
--- a/third_party/aom/av1/common/warped_motion.h
+++ b/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
index 8aa14696f6..8aa14696f6 100644
--- 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
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
index d9fb537856..d9fb537856 100644
--- a/third_party/aom/av1/common/x86/av1_convolve_scale_sse4.c
+++ b/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
index 212d3bd723..212d3bd723 100644
--- a/third_party/aom/av1/common/x86/av1_highbd_convolve_sse4.c
+++ b/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
index 5db2ccf6c3..5db2ccf6c3 100644
--- a/third_party/aom/av1/common/x86/av1_inv_txfm_avx2.c
+++ b/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
index f74cbaeaa5..f74cbaeaa5 100644
--- a/third_party/aom/av1/common/x86/av1_inv_txfm_avx2.h
+++ b/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
index 995bc3da44..995bc3da44 100644
--- a/third_party/aom/av1/common/x86/av1_inv_txfm_ssse3.c
+++ b/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
index 66bd339d11..66bd339d11 100644
--- a/third_party/aom/av1/common/x86/av1_inv_txfm_ssse3.h
+++ b/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
index 77aeb6eb13..77aeb6eb13 100644
--- a/third_party/aom/av1/common/x86/av1_txfm_sse2.h
+++ b/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
index 90b9879cc4..90b9879cc4 100644
--- a/third_party/aom/av1/common/x86/av1_txfm_sse4.c
+++ b/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
index 6cad821b1b..6cad821b1b 100644
--- a/third_party/aom/av1/common/x86/av1_txfm_sse4.h
+++ b/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
index a8bfdcce6b..a8bfdcce6b 100644
--- a/third_party/aom/av1/common/x86/cfl_avx2.c
+++ b/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
index 3b342cd4e4..3b342cd4e4 100644
--- a/third_party/aom/av1/common/x86/cfl_simd.h
+++ b/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
index 4783fe098c..4783fe098c 100644
--- a/third_party/aom/av1/common/x86/cfl_sse2.c
+++ b/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
index bbf0072955..bbf0072955 100644
--- a/third_party/aom/av1/common/x86/cfl_ssse3.c
+++ b/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
index 0acafd0446..0acafd0446 100644
--- a/third_party/aom/av1/common/x86/convolve_2d_avx2.c
+++ b/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
index b1a62a4f69..b1a62a4f69 100644
--- a/third_party/aom/av1/common/x86/convolve_2d_sse2.c
+++ b/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
index 0e91ea9475..0e91ea9475 100644
--- a/third_party/aom/av1/common/x86/convolve_avx2.c
+++ b/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
index 5016642dee..5016642dee 100644
--- a/third_party/aom/av1/common/x86/convolve_sse2.c
+++ b/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
index c11edc1d45..c11edc1d45 100644
--- a/third_party/aom/av1/common/x86/filterintra_sse4.c
+++ b/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
index ae68f0bbb3..ae68f0bbb3 100644
--- a/third_party/aom/av1/common/x86/highbd_convolve_2d_avx2.c
+++ b/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
index 15f8872c18..15f8872c18 100644
--- a/third_party/aom/av1/common/x86/highbd_convolve_2d_sse2.c
+++ b/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
index 3f8dafb4b3..3f8dafb4b3 100644
--- a/third_party/aom/av1/common/x86/highbd_convolve_2d_sse4.c
+++ b/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
index 1d029db39a..1d029db39a 100644
--- a/third_party/aom/av1/common/x86/highbd_convolve_2d_ssse3.c
+++ b/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
index ade2af03e4..ade2af03e4 100644
--- a/third_party/aom/av1/common/x86/highbd_inv_txfm_avx2.c
+++ b/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
index e29e0baf50..e29e0baf50 100644
--- a/third_party/aom/av1/common/x86/highbd_inv_txfm_sse4.c
+++ b/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
index e298cf6531..e298cf6531 100644
--- a/third_party/aom/av1/common/x86/highbd_jnt_convolve_avx2.c
+++ b/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
index 1a29985b56..1a29985b56 100644
--- a/third_party/aom/av1/common/x86/highbd_jnt_convolve_sse4.c
+++ b/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
index 6f24e5948a..6f24e5948a 100644
--- a/third_party/aom/av1/common/x86/highbd_txfm_utility_sse4.h
+++ b/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
index 4bcab05645..4bcab05645 100644
--- a/third_party/aom/av1/common/x86/highbd_warp_plane_sse4.c
+++ b/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
index 0c8a8505b0..0c8a8505b0 100644
--- a/third_party/aom/av1/common/x86/highbd_wiener_convolve_avx2.c
+++ b/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
index 818b1099c9..818b1099c9 100644
--- a/third_party/aom/av1/common/x86/highbd_wiener_convolve_ssse3.c
+++ b/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
index 0c857b5835..0c857b5835 100644
--- a/third_party/aom/av1/common/x86/intra_edge_sse4.c
+++ b/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
index 9f2e2b4578..9f2e2b4578 100644
--- a/third_party/aom/av1/common/x86/jnt_convolve_avx2.c
+++ b/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
index 87dc3242e8..87dc3242e8 100644
--- a/third_party/aom/av1/common/x86/jnt_convolve_sse2.c
+++ b/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
index 822772782b..822772782b 100644
--- a/third_party/aom/av1/common/x86/jnt_convolve_ssse3.c
+++ b/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
index f645e04541..f645e04541 100644
--- a/third_party/aom/av1/common/x86/reconinter_avx2.c
+++ b/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
index 5171ca4934..5171ca4934 100644
--- a/third_party/aom/av1/common/x86/reconinter_sse4.c
+++ b/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
index cf684447c5..cf684447c5 100644
--- a/third_party/aom/av1/common/x86/reconinter_ssse3.c
+++ b/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
index 0aaf1f4547..0aaf1f4547 100644
--- a/third_party/aom/av1/common/x86/selfguided_avx2.c
+++ b/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
index ea3f6d9422..ea3f6d9422 100644
--- a/third_party/aom/av1/common/x86/selfguided_sse4.c
+++ b/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
index b810cea2e5..b810cea2e5 100644
--- a/third_party/aom/av1/common/x86/warp_plane_sse4.c
+++ b/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
index 87a6e12396..87a6e12396 100644
--- a/third_party/aom/av1/common/x86/wiener_convolve_avx2.c
+++ b/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
index f9d00b7330..f9d00b7330 100644
--- a/third_party/aom/av1/common/x86/wiener_convolve_sse2.c
+++ b/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
index 8d8f3dfdb4..8d8f3dfdb4 100644
--- a/third_party/aom/av1/decoder/accounting.c
+++ b/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
index 288e5e63e3..288e5e63e3 100644
--- a/third_party/aom/av1/decoder/accounting.h
+++ b/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
index 31f14b531f..31f14b531f 100644
--- a/third_party/aom/av1/decoder/decodeframe.c
+++ b/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
index ddad273f18..ddad273f18 100644
--- a/third_party/aom/av1/decoder/decodeframe.h
+++ b/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
index 551e4d5437..551e4d5437 100644
--- a/third_party/aom/av1/decoder/decodemv.c
+++ b/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
index 1625e5bd23..1625e5bd23 100644
--- a/third_party/aom/av1/decoder/decodemv.h
+++ b/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
index a5f4fd67fa..a5f4fd67fa 100644
--- a/third_party/aom/av1/decoder/decoder.c
+++ b/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
index 5ca939c245..5ca939c245 100644
--- a/third_party/aom/av1/decoder/decoder.h
+++ b/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
index f3ef2d55e4..f3ef2d55e4 100644
--- a/third_party/aom/av1/decoder/decodetxb.c
+++ b/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
index fe04f6abdd..fe04f6abdd 100644
--- a/third_party/aom/av1/decoder/decodetxb.h
+++ b/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
index 9d54bd13dd..9d54bd13dd 100644
--- a/third_party/aom/av1/decoder/detokenize.c
+++ b/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
index 173b437a94..173b437a94 100644
--- a/third_party/aom/av1/decoder/detokenize.h
+++ b/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
index 3946c787a1..3946c787a1 100644
--- a/third_party/aom/av1/decoder/dthread.c
+++ b/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
index 1d264b07eb..1d264b07eb 100644
--- a/third_party/aom/av1/decoder/dthread.h
+++ b/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
index e6c89298a4..e6c89298a4 100644
--- a/third_party/aom/av1/decoder/inspection.c
+++ b/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
index 7214a9beda..7214a9beda 100644
--- a/third_party/aom/av1/decoder/inspection.h
+++ b/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
index 44ecf818e7..44ecf818e7 100644
--- a/third_party/aom/av1/decoder/obu.c
+++ b/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
index 5ab243fc90..5ab243fc90 100644
--- a/third_party/aom/av1/decoder/obu.h
+++ b/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
index 80f8e2e66d..80f8e2e66d 100644
--- a/third_party/aom/av1/encoder/aq_complexity.c
+++ b/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
index 3421d74c93..3421d74c93 100644
--- a/third_party/aom/av1/encoder/aq_complexity.h
+++ b/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
index f532d48da5..f532d48da5 100644
--- a/third_party/aom/av1/encoder/aq_cyclicrefresh.c
+++ b/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
index b45781983d..b45781983d 100644
--- a/third_party/aom/av1/encoder/aq_cyclicrefresh.h
+++ b/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
index 58f906bdc0..58f906bdc0 100644
--- a/third_party/aom/av1/encoder/aq_variance.c
+++ b/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
index 2d22b663e5..2d22b663e5 100644
--- a/third_party/aom/av1/encoder/aq_variance.h
+++ b/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
index 36e7d33702..36e7d33702 100644
--- a/third_party/aom/av1/encoder/arm/neon/quantize_neon.c
+++ b/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
index 98505e0b1a..98505e0b1a 100644
--- a/third_party/aom/av1/encoder/av1_fwd_txfm1d.c
+++ b/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
index 9dcf16552c..9dcf16552c 100644
--- a/third_party/aom/av1/encoder/av1_fwd_txfm1d.h
+++ b/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
index 98b6530db1..98b6530db1 100644
--- a/third_party/aom/av1/encoder/av1_fwd_txfm1d_cfg.h
+++ b/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
index f25a667cf4..f25a667cf4 100644
--- a/third_party/aom/av1/encoder/av1_fwd_txfm2d.c
+++ b/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
index a0a9260052..a0a9260052 100644
--- a/third_party/aom/av1/encoder/av1_quantize.c
+++ b/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
index 35af9a67ae..35af9a67ae 100644
--- a/third_party/aom/av1/encoder/av1_quantize.h
+++ b/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
index 2c4acdb021..2c4acdb021 100644
--- a/third_party/aom/av1/encoder/bitstream.c
+++ b/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
index 465ccaed57..465ccaed57 100644
--- a/third_party/aom/av1/encoder/bitstream.h
+++ b/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
index 0bc5dea825..0bc5dea825 100644
--- a/third_party/aom/av1/encoder/block.h
+++ b/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
index f7cff9e532..f7cff9e532 100644
--- a/third_party/aom/av1/encoder/blockiness.c
+++ b/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
index 57f59f304b..57f59f304b 100644
--- a/third_party/aom/av1/encoder/context_tree.c
+++ b/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
index 4efc349852..4efc349852 100644
--- a/third_party/aom/av1/encoder/context_tree.h
+++ b/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
index e4c59dd9c6..e4c59dd9c6 100644
--- a/third_party/aom/av1/encoder/corner_detect.c
+++ b/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
index cab59a7743..cab59a7743 100644
--- a/third_party/aom/av1/encoder/corner_detect.h
+++ b/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
index 29e934debd..29e934debd 100644
--- a/third_party/aom/av1/encoder/corner_match.c
+++ b/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
index 535d2faed1..535d2faed1 100644
--- a/third_party/aom/av1/encoder/corner_match.h
+++ b/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
index 323e2aed58..323e2aed58 100644
--- a/third_party/aom/av1/encoder/cost.c
+++ b/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
index af5b098370..af5b098370 100644
--- a/third_party/aom/av1/encoder/cost.h
+++ b/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
index 04088b25f9..04088b25f9 100644
--- a/third_party/aom/av1/encoder/dwt.c
+++ b/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
index 37306c6a5f..37306c6a5f 100644
--- a/third_party/aom/av1/encoder/dwt.h
+++ b/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
index cb226c59e2..cb226c59e2 100644
--- a/third_party/aom/av1/encoder/encodeframe.c
+++ b/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
index e8cf9b4685..e8cf9b4685 100644
--- a/third_party/aom/av1/encoder/encodeframe.h
+++ b/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
index ad12577e6e..ad12577e6e 100644
--- a/third_party/aom/av1/encoder/encodemb.c
+++ b/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
index 39080de599..39080de599 100644
--- a/third_party/aom/av1/encoder/encodemb.h
+++ b/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
index 42eb5abf62..42eb5abf62 100644
--- a/third_party/aom/av1/encoder/encodemv.c
+++ b/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
index 37ff547c8c..37ff547c8c 100644
--- a/third_party/aom/av1/encoder/encodemv.h
+++ b/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
index a2da2df899..a2da2df899 100644
--- a/third_party/aom/av1/encoder/encoder.c
+++ b/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
index ee7fc46379..ee7fc46379 100644
--- a/third_party/aom/av1/encoder/encoder.h
+++ b/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
index 5a31d93d73..5a31d93d73 100644
--- a/third_party/aom/av1/encoder/encodetxb.c
+++ b/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
index 40ae343b0d..40ae343b0d 100644
--- a/third_party/aom/av1/encoder/encodetxb.h
+++ b/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
index e8ac30bb52..e8ac30bb52 100644
--- a/third_party/aom/av1/encoder/ethread.c
+++ b/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
index 5de4b48038..5de4b48038 100644
--- a/third_party/aom/av1/encoder/ethread.h
+++ b/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
index e9621a5742..e9621a5742 100644
--- a/third_party/aom/av1/encoder/extend.c
+++ b/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
index e0432cc970..e0432cc970 100644
--- a/third_party/aom/av1/encoder/extend.h
+++ b/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
index 69dd20c526..69dd20c526 100644
--- a/third_party/aom/av1/encoder/firstpass.c
+++ b/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
index 4b7325ae21..4b7325ae21 100644
--- a/third_party/aom/av1/encoder/firstpass.h
+++ b/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
index e9f8b0bb47..e9f8b0bb47 100644
--- a/third_party/aom/av1/encoder/global_motion.c
+++ b/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
index c7c016c430..c7c016c430 100644
--- a/third_party/aom/av1/encoder/global_motion.h
+++ b/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
index 945dc37331..945dc37331 100644
--- a/third_party/aom/av1/encoder/grain_test_vectors.h
+++ b/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
index 180115d9f2..180115d9f2 100644
--- a/third_party/aom/av1/encoder/hash.c
+++ b/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
index 826c004d6f..826c004d6f 100644
--- a/third_party/aom/av1/encoder/hash.h
+++ b/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
index e85a516e85..e85a516e85 100644
--- a/third_party/aom/av1/encoder/hash_motion.c
+++ b/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
index df3ec32158..df3ec32158 100644
--- a/third_party/aom/av1/encoder/hash_motion.h
+++ b/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
index 67898fd184..67898fd184 100644
--- a/third_party/aom/av1/encoder/hybrid_fwd_txfm.c
+++ b/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
index daabc7119a..daabc7119a 100644
--- a/third_party/aom/av1/encoder/hybrid_fwd_txfm.h
+++ b/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
index 9e526b88b7..9e526b88b7 100644
--- a/third_party/aom/av1/encoder/k_means_template.h
+++ b/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
index 1bf8ecbacb..1bf8ecbacb 100644
--- a/third_party/aom/av1/encoder/lookahead.c
+++ b/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
index e55224cf75..e55224cf75 100644
--- a/third_party/aom/av1/encoder/lookahead.h
+++ b/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
index 64f9361767..64f9361767 100644
--- a/third_party/aom/av1/encoder/mathutils.h
+++ b/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
index 1a35ff77c7..1a35ff77c7 100644
--- a/third_party/aom/av1/encoder/mbgraph.c
+++ b/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
index ba08476f7a..ba08476f7a 100644
--- a/third_party/aom/av1/encoder/mbgraph.h
+++ b/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
index 8f6de9b532..8f6de9b532 100644
--- a/third_party/aom/av1/encoder/mcomp.c
+++ b/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
index a975218b09..a975218b09 100644
--- a/third_party/aom/av1/encoder/mcomp.h
+++ b/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
index 2e86dee430..2e86dee430 100644
--- a/third_party/aom/av1/encoder/mips/msa/error_msa.c
+++ b/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
index 085c08bfb8..085c08bfb8 100644
--- a/third_party/aom/av1/encoder/mips/msa/fdct4x4_msa.c
+++ b/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
index 531ae090a3..531ae090a3 100644
--- a/third_party/aom/av1/encoder/mips/msa/temporal_filter_msa.c
+++ b/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
index d21def43a8..d21def43a8 100644
--- a/third_party/aom/av1/encoder/ml.c
+++ b/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
index cb8ef2871b..cb8ef2871b 100644
--- a/third_party/aom/av1/encoder/ml.h
+++ b/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
index e61cd02ce4..e61cd02ce4 100644
--- a/third_party/aom/av1/encoder/palette.c
+++ b/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
index 8b88c4755c..8b88c4755c 100644
--- a/third_party/aom/av1/encoder/palette.h
+++ b/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
index 437ea43f9e..437ea43f9e 100644
--- a/third_party/aom/av1/encoder/partition_model_weights.h
+++ b/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
index 6d154a7d22..6d154a7d22 100644
--- a/third_party/aom/av1/encoder/pickcdef.c
+++ b/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
index c5508e25c4..c5508e25c4 100644
--- a/third_party/aom/av1/encoder/picklpf.c
+++ b/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
index 357097ae1b..357097ae1b 100644
--- a/third_party/aom/av1/encoder/picklpf.h
+++ b/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
index e7804f6b44..e7804f6b44 100644
--- a/third_party/aom/av1/encoder/pickrst.c
+++ b/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
index 3fec0c34b3..3fec0c34b3 100644
--- a/third_party/aom/av1/encoder/pickrst.h
+++ b/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
index 40dd467689..40dd467689 100644
--- a/third_party/aom/av1/encoder/pustats.h
+++ b/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
index 0bca391029..0bca391029 100644
--- a/third_party/aom/av1/encoder/random.h
+++ b/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
index 781f528ebf..781f528ebf 100644
--- a/third_party/aom/av1/encoder/ransac.c
+++ b/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
index c429f2ce5e..c429f2ce5e 100644
--- a/third_party/aom/av1/encoder/ransac.h
+++ b/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
index 7cd0962c57..7cd0962c57 100644
--- a/third_party/aom/av1/encoder/rate_distortion_model_params.h
+++ b/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
index 2597fb9908..2597fb9908 100644
--- a/third_party/aom/av1/encoder/ratectrl.c
+++ b/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
index 198ecab975..198ecab975 100644
--- a/third_party/aom/av1/encoder/ratectrl.h
+++ b/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
index b87d89e50b..b87d89e50b 100644
--- a/third_party/aom/av1/encoder/rd.c
+++ b/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
index 755b61df50..755b61df50 100644
--- a/third_party/aom/av1/encoder/rd.h
+++ b/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
index c2d15534f0..c2d15534f0 100644
--- a/third_party/aom/av1/encoder/rdopt.c
+++ b/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
index 4c11f90b8f..4c11f90b8f 100644
--- a/third_party/aom/av1/encoder/rdopt.h
+++ b/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
index 23d920fc32..23d920fc32 100644
--- a/third_party/aom/av1/encoder/reconinter_enc.c
+++ b/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
index 10d5e8c284..10d5e8c284 100644
--- a/third_party/aom/av1/encoder/reconinter_enc.h
+++ b/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
index 2e9102745c..2e9102745c 100644
--- a/third_party/aom/av1/encoder/segmentation.c
+++ b/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
index 1ad13d66a9..1ad13d66a9 100644
--- a/third_party/aom/av1/encoder/segmentation.h
+++ b/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
index 4c35baae01..4c35baae01 100644
--- a/third_party/aom/av1/encoder/speed_features.c
+++ b/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
index 41013b2e79..41013b2e79 100644
--- a/third_party/aom/av1/encoder/speed_features.h
+++ b/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
index 75fdf02a52..75fdf02a52 100644
--- a/third_party/aom/av1/encoder/temporal_filter.c
+++ b/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
index 2ddc68b2c9..2ddc68b2c9 100644
--- a/third_party/aom/av1/encoder/temporal_filter.h
+++ b/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
index 16a6a9a35a..16a6a9a35a 100644
--- a/third_party/aom/av1/encoder/tokenize.c
+++ b/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
index 63b505f36f..63b505f36f 100644
--- a/third_party/aom/av1/encoder/tokenize.h
+++ b/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
index 405bc9e6eb..405bc9e6eb 100644
--- a/third_party/aom/av1/encoder/tx_prune_model_weights.h
+++ b/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
index e6edbb6af0..e6edbb6af0 100644
--- a/third_party/aom/av1/encoder/wedge_utils.c
+++ b/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
index 07615543c6..07615543c6 100644
--- a/third_party/aom/av1/encoder/x86/av1_fwd_txfm1d_sse4.c
+++ b/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
index 592462e20d..592462e20d 100644
--- a/third_party/aom/av1/encoder/x86/av1_fwd_txfm2d_avx2.c
+++ b/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
index 8ec0256eb8..8ec0256eb8 100644
--- a/third_party/aom/av1/encoder/x86/av1_fwd_txfm2d_sse4.c
+++ b/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
index 38707137c4..38707137c4 100644
--- a/third_party/aom/av1/encoder/x86/av1_fwd_txfm_avx2.h
+++ b/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
index 6aae7ce1e4..6aae7ce1e4 100644
--- a/third_party/aom/av1/encoder/x86/av1_fwd_txfm_sse2.c
+++ b/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
index 99a6b90829..99a6b90829 100644
--- a/third_party/aom/av1/encoder/x86/av1_fwd_txfm_sse2.h
+++ b/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
index b58911fcb2..b58911fcb2 100644
--- a/third_party/aom/av1/encoder/x86/av1_highbd_quantize_avx2.c
+++ b/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
index 40b3b460b6..40b3b460b6 100644
--- a/third_party/aom/av1/encoder/x86/av1_highbd_quantize_sse4.c
+++ b/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
index df22aaba7c..df22aaba7c 100644
--- a/third_party/aom/av1/encoder/x86/av1_quantize_avx2.c
+++ b/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
index b07e7717f3..b07e7717f3 100644
--- a/third_party/aom/av1/encoder/x86/av1_quantize_sse2.c
+++ b/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
index ad4ae274e2..ad4ae274e2 100644
--- 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
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
index faa2a232a3..faa2a232a3 100644
--- 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
diff --git a/third_party/aom/av1/encoder/x86/av1_txfm1d_sse4.h b/media/libaom/src/av1/encoder/x86/av1_txfm1d_sse4.h
index 6df2a8bdbb..6df2a8bdbb 100644
--- a/third_party/aom/av1/encoder/x86/av1_txfm1d_sse4.h
+++ b/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
index 93f37b71d3..93f37b71d3 100644
--- a/third_party/aom/av1/encoder/x86/corner_match_sse4.c
+++ b/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
index b185548184..b185548184 100644
--- a/third_party/aom/av1/encoder/x86/dct_sse2.asm
+++ b/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
index 7642f57d18..7642f57d18 100644
--- a/third_party/aom/av1/encoder/x86/encodetxb_avx2.c
+++ b/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
index dedb4d02f6..dedb4d02f6 100644
--- a/third_party/aom/av1/encoder/x86/encodetxb_sse2.c
+++ b/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
index 5e0687cd38..5e0687cd38 100644
--- a/third_party/aom/av1/encoder/x86/encodetxb_sse4.c
+++ b/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
index 7d4f695854..7d4f695854 100644
--- a/third_party/aom/av1/encoder/x86/error_intrin_avx2.c
+++ b/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
index 72e9e22b18..72e9e22b18 100644
--- a/third_party/aom/av1/encoder/x86/error_sse2.asm
+++ b/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
index 65fa463117..65fa463117 100644
--- a/third_party/aom/av1/encoder/x86/hash_sse42.c
+++ b/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
index 777304ace7..777304ace7 100644
--- 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
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
index 535485ae8e..535485ae8e 100644
--- a/third_party/aom/av1/encoder/x86/highbd_fwd_txfm_sse4.c
+++ b/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
index 06aaaa7eee..06aaaa7eee 100644
--- a/third_party/aom/av1/encoder/x86/pickrst_avx2.c
+++ b/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
index 04e4d1afc4..04e4d1afc4 100644
--- a/third_party/aom/av1/encoder/x86/pickrst_sse4.c
+++ b/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
index 30983d1c10..30983d1c10 100644
--- a/third_party/aom/av1/encoder/x86/temporal_filter_apply_sse2.asm
+++ b/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
index 2a792f14e6..2a792f14e6 100644
--- a/third_party/aom/av1/encoder/x86/wedge_utils_avx2.c
+++ b/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
index 4d2e99f258..4d2e99f258 100644
--- a/third_party/aom/av1/encoder/x86/wedge_utils_sse2.c
+++ b/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
index 5c8e0e09d1..5c8e0e09d1 100644
--- a/third_party/aom/av1/exports_com
+++ b/media/libaom/src/av1/exports_com
diff --git a/third_party/aom/av1/exports_dec b/media/libaom/src/av1/exports_dec
index daabf6766d..daabf6766d 100644
--- a/third_party/aom/av1/exports_dec
+++ b/media/libaom/src/av1/exports_dec
diff --git a/third_party/aom/av1/exports_enc b/media/libaom/src/av1/exports_enc
index dc4a9eae79..dc4a9eae79 100644
--- a/third_party/aom/av1/exports_enc
+++ b/media/libaom/src/av1/exports_enc
diff --git a/third_party/aom/av1/exports_test b/media/libaom/src/av1/exports_test
index dab3775750..dab3775750 100644
--- a/third_party/aom/av1/exports_test
+++ b/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
index 62f0a10ab3..62f0a10ab3 100644
--- a/third_party/aom/build/cmake/aom_config.c.template
+++ b/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
index a07438cfe3..a07438cfe3 100644
--- a/third_party/aom/build/cmake/aom_config_defaults.cmake
+++ b/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
index c0c7381e87..c0c7381e87 100644
--- a/third_party/aom/build/cmake/aom_configure.cmake
+++ b/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
index 0688704e5f..0688704e5f 100644
--- a/third_party/aom/build/cmake/aom_experiment_deps.cmake
+++ b/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
index be32a32126..be32a32126 100644
--- a/third_party/aom/build/cmake/aom_optimization.cmake
+++ b/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
index 79192c1fa8..79192c1fa8 100644
--- a/third_party/aom/build/cmake/compiler_flags.cmake
+++ b/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
index f115610baf..f115610baf 100644
--- a/third_party/aom/build/cmake/compiler_tests.cmake
+++ b/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
index 6e8089e635..6e8089e635 100644
--- a/third_party/aom/build/cmake/cpu.cmake
+++ b/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
index 6f81736f00..6f81736f00 100644
--- a/third_party/aom/build/cmake/dist.cmake
+++ b/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
index e0813dc0f2..e0813dc0f2 100644
--- a/third_party/aom/build/cmake/exports.cmake
+++ b/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
index 576920e36c..576920e36c 100644
--- a/third_party/aom/build/cmake/exports_sources.cmake
+++ b/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
index b91c036de8..b91c036de8 100644
--- a/third_party/aom/build/cmake/generate_aom_config_templates.cmake
+++ b/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
index 7ab5aaef89..7ab5aaef89 100644
--- a/third_party/aom/build/cmake/generate_exports.cmake
+++ b/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
index 300e3e310d..300e3e310d 100644
--- a/third_party/aom/build/cmake/ios-Info.plist
+++ b/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
index 167ece200a..167ece200a 100755..100644
--- a/third_party/aom/build/cmake/iosbuild.sh
+++ b/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
index 9e4cbea435..9e4cbea435 100644
--- a/third_party/aom/build/cmake/msvc_runtime.cmake
+++ b/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
index 64e20214e9..64e20214e9 100644
--- a/third_party/aom/build/cmake/pkg_config.cmake
+++ b/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
index 46e06907cc..46e06907cc 100755..100644
--- a/third_party/aom/build/cmake/rtcd.pl
+++ b/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
index 77708e101c..77708e101c 100644
--- a/third_party/aom/build/cmake/sanitizers.cmake
+++ b/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
index 8f40951455..8f40951455 100644
--- a/third_party/aom/build/cmake/toolchains/arm-ios-common.cmake
+++ b/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
index 6feb1090f2..6feb1090f2 100644
--- a/third_party/aom/build/cmake/toolchains/arm64-ios.cmake
+++ b/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
index 590a97a8e5..590a97a8e5 100644
--- a/third_party/aom/build/cmake/toolchains/arm64-linux-gcc.cmake
+++ b/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
index b5b2ff1cd3..b5b2ff1cd3 100644
--- a/third_party/aom/build/cmake/toolchains/arm64-mingw-gcc.cmake
+++ b/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
index 32a1b534ad..32a1b534ad 100644
--- a/third_party/aom/build/cmake/toolchains/armv7-ios.cmake
+++ b/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
index 7d3d63085e..7d3d63085e 100644
--- a/third_party/aom/build/cmake/toolchains/armv7-linux-gcc.cmake
+++ b/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
index cf06a11b38..cf06a11b38 100644
--- a/third_party/aom/build/cmake/toolchains/armv7-mingw-gcc.cmake
+++ b/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
index 0940a6ee8a..0940a6ee8a 100644
--- a/third_party/aom/build/cmake/toolchains/armv7s-ios.cmake
+++ b/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
index 76e0bd140b..76e0bd140b 100644
--- a/third_party/aom/build/cmake/toolchains/ios-simulator-common.cmake
+++ b/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
index 0f93490b11..0f93490b11 100644
--- a/third_party/aom/build/cmake/toolchains/mips32-linux-gcc.cmake
+++ b/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
index ad9aab09d8..ad9aab09d8 100644
--- a/third_party/aom/build/cmake/toolchains/mips64-linux-gcc.cmake
+++ b/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
index c86cc27e3d..c86cc27e3d 100644
--- a/third_party/aom/build/cmake/toolchains/ppc-linux-gcc.cmake
+++ b/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
index 6b6f52cac2..6b6f52cac2 100644
--- a/third_party/aom/build/cmake/toolchains/x86-ios-simulator.cmake
+++ b/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
index c2a700bfef..c2a700bfef 100644
--- a/third_party/aom/build/cmake/toolchains/x86-linux.cmake
+++ b/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
index 7a46e06a9a..7a46e06a9a 100644
--- a/third_party/aom/build/cmake/toolchains/x86-macos.cmake
+++ b/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
index c986c4ee36..c986c4ee36 100644
--- a/third_party/aom/build/cmake/toolchains/x86-mingw-gcc.cmake
+++ b/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
index d4b40ed098..d4b40ed098 100644
--- a/third_party/aom/build/cmake/toolchains/x86_64-ios-simulator.cmake
+++ b/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
index 00d94d5f1f..00d94d5f1f 100644
--- a/third_party/aom/build/cmake/toolchains/x86_64-mingw-gcc.cmake
+++ b/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
index b70ec40137..b70ec40137 100644
--- a/third_party/aom/build/cmake/util.cmake
+++ b/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
index d169b12ac6..d169b12ac6 100644
--- a/third_party/aom/build/cmake/version.cmake
+++ b/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
index 7d23f2b277..7d23f2b277 100755..100644
--- a/third_party/aom/build/cmake/version.pl
+++ b/media/libaom/src/build/cmake/version.pl
diff --git a/third_party/aom/codereview.settings b/media/libaom/src/codereview.settings
index 185e9344cf..185e9344cf 100644
--- a/third_party/aom/codereview.settings
+++ b/media/libaom/src/codereview.settings
diff --git a/third_party/aom/common/args.c b/media/libaom/src/common/args.c
index 7131e24dee..7131e24dee 100644
--- a/third_party/aom/common/args.c
+++ b/media/libaom/src/common/args.c
diff --git a/third_party/aom/common/args.h b/media/libaom/src/common/args.h
index 6a26642692..6a26642692 100644
--- a/third_party/aom/common/args.h
+++ b/media/libaom/src/common/args.h
diff --git a/third_party/aom/common/av1_config.c b/media/libaom/src/common/av1_config.c
index e8decf76fe..e8decf76fe 100644
--- a/third_party/aom/common/av1_config.c
+++ b/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
index a15bedb305..a15bedb305 100644
--- a/third_party/aom/common/av1_config.h
+++ b/media/libaom/src/common/av1_config.h
diff --git a/third_party/aom/common/ivfdec.c b/media/libaom/src/common/ivfdec.c
index 80d73b04c9..80d73b04c9 100644
--- a/third_party/aom/common/ivfdec.c
+++ b/media/libaom/src/common/ivfdec.c
diff --git a/third_party/aom/common/ivfdec.h b/media/libaom/src/common/ivfdec.h
index ea294faa18..ea294faa18 100644
--- a/third_party/aom/common/ivfdec.h
+++ b/media/libaom/src/common/ivfdec.h
diff --git a/third_party/aom/common/ivfenc.c b/media/libaom/src/common/ivfenc.c
index 64715f4d74..64715f4d74 100644
--- a/third_party/aom/common/ivfenc.c
+++ b/media/libaom/src/common/ivfenc.c
diff --git a/third_party/aom/common/ivfenc.h b/media/libaom/src/common/ivfenc.h
index 8f6d947d47..8f6d947d47 100644
--- a/third_party/aom/common/ivfenc.h
+++ b/media/libaom/src/common/ivfenc.h
diff --git a/third_party/aom/common/md5_utils.c b/media/libaom/src/common/md5_utils.c
index b69e1cc72c..b69e1cc72c 100644
--- a/third_party/aom/common/md5_utils.c
+++ b/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
index 144fa3ad28..144fa3ad28 100644
--- a/third_party/aom/common/md5_utils.h
+++ b/media/libaom/src/common/md5_utils.h
diff --git a/third_party/aom/common/obudec.c b/media/libaom/src/common/obudec.c
index acbd12e0c8..acbd12e0c8 100644
--- a/third_party/aom/common/obudec.c
+++ b/media/libaom/src/common/obudec.c
diff --git a/third_party/aom/common/obudec.h b/media/libaom/src/common/obudec.h
index b2adb1e3d7..b2adb1e3d7 100644
--- a/third_party/aom/common/obudec.h
+++ b/media/libaom/src/common/obudec.h
diff --git a/third_party/aom/common/rawenc.c b/media/libaom/src/common/rawenc.c
index 5a2731d3ac..5a2731d3ac 100644
--- a/third_party/aom/common/rawenc.c
+++ b/media/libaom/src/common/rawenc.c
diff --git a/third_party/aom/common/rawenc.h b/media/libaom/src/common/rawenc.h
index cf5e00e6fd..cf5e00e6fd 100644
--- a/third_party/aom/common/rawenc.h
+++ b/media/libaom/src/common/rawenc.h
diff --git a/third_party/aom/common/tools_common.c b/media/libaom/src/common/tools_common.c
index 21cd800262..21cd800262 100644
--- a/third_party/aom/common/tools_common.c
+++ b/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
index 4e1d12f4a0..4e1d12f4a0 100644
--- a/third_party/aom/common/tools_common.h
+++ b/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
index bf95031be6..bf95031be6 100644
--- a/third_party/aom/common/video_common.h
+++ b/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
index 47ad6e1891..47ad6e1891 100644
--- a/third_party/aom/common/video_reader.c
+++ b/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
index 903deae849..903deae849 100644
--- a/third_party/aom/common/video_reader.h
+++ b/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
index a7ec309fc7..a7ec309fc7 100644
--- a/third_party/aom/common/video_writer.c
+++ b/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
index 3e2b6554b8..3e2b6554b8 100644
--- a/third_party/aom/common/video_writer.h
+++ b/media/libaom/src/common/video_writer.h
diff --git a/third_party/aom/common/warnings.c b/media/libaom/src/common/warnings.c
index 2facee2526..2facee2526 100644
--- a/third_party/aom/common/warnings.c
+++ b/media/libaom/src/common/warnings.c
diff --git a/third_party/aom/common/warnings.h b/media/libaom/src/common/warnings.h
index 36f1fe0706..36f1fe0706 100644
--- a/third_party/aom/common/warnings.h
+++ b/media/libaom/src/common/warnings.h
diff --git a/third_party/aom/common/webmdec.cc b/media/libaom/src/common/webmdec.cc
index 17ac53c930..17ac53c930 100644
--- a/third_party/aom/common/webmdec.cc
+++ b/media/libaom/src/common/webmdec.cc
diff --git a/third_party/aom/common/webmdec.h b/media/libaom/src/common/webmdec.h
index 5ac75cb304..5ac75cb304 100644
--- a/third_party/aom/common/webmdec.h
+++ b/media/libaom/src/common/webmdec.h
diff --git a/third_party/aom/common/webmenc.cc b/media/libaom/src/common/webmenc.cc
index 58ab336707..58ab336707 100644
--- a/third_party/aom/common/webmenc.cc
+++ b/media/libaom/src/common/webmenc.cc
diff --git a/third_party/aom/common/webmenc.h b/media/libaom/src/common/webmenc.h
index aa9832fbae..aa9832fbae 100644
--- a/third_party/aom/common/webmenc.h
+++ b/media/libaom/src/common/webmenc.h
diff --git a/third_party/aom/common/y4menc.c b/media/libaom/src/common/y4menc.c
index 585d221976..585d221976 100644
--- a/third_party/aom/common/y4menc.c
+++ b/media/libaom/src/common/y4menc.c
diff --git a/third_party/aom/common/y4menc.h b/media/libaom/src/common/y4menc.h
index f6d5fd86be..f6d5fd86be 100644
--- a/third_party/aom/common/y4menc.h
+++ b/media/libaom/src/common/y4menc.h
diff --git a/third_party/aom/common/y4minput.c b/media/libaom/src/common/y4minput.c
index eca8b1bbac..eca8b1bbac 100644
--- a/third_party/aom/common/y4minput.c
+++ b/media/libaom/src/common/y4minput.c
diff --git a/third_party/aom/common/y4minput.h b/media/libaom/src/common/y4minput.h
index 01b9ce9726..01b9ce9726 100644
--- a/third_party/aom/common/y4minput.h
+++ b/media/libaom/src/common/y4minput.h
diff --git a/third_party/aom/docs.cmake b/media/libaom/src/docs.cmake
index b5bfa9b560..b5bfa9b560 100644
--- a/third_party/aom/docs.cmake
+++ b/media/libaom/src/docs.cmake
diff --git a/third_party/aom/examples/analyzer.cc b/media/libaom/src/examples/analyzer.cc
index 6a42eca248..6a42eca248 100644
--- a/third_party/aom/examples/analyzer.cc
+++ b/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
index 8e3d216fe6..8e3d216fe6 100644
--- a/third_party/aom/examples/aom_cx_set_ref.c
+++ b/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
index bc127b78df..bc127b78df 100644
--- a/third_party/aom/examples/decode_to_md5.c
+++ b/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
index 214401958a..214401958a 100644
--- a/third_party/aom/examples/decode_with_drops.c
+++ b/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
index e43b372506..e43b372506 100644
--- a/third_party/aom/examples/encoder_util.c
+++ b/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
index a6bb3fb486..a6bb3fb486 100644
--- a/third_party/aom/examples/encoder_util.h
+++ b/media/libaom/src/examples/encoder_util.h
diff --git a/third_party/aom/examples/inspect.c b/media/libaom/src/examples/inspect.c
index 9d5f0dcfc4..9d5f0dcfc4 100644
--- a/third_party/aom/examples/inspect.c
+++ b/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
index 159f1617a3..159f1617a3 100644
--- a/third_party/aom/examples/lightfield_bitstream_parsing.c
+++ b/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
index f5e54db7f1..f5e54db7f1 100644
--- a/third_party/aom/examples/lightfield_decoder.c
+++ b/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
index e55cd5ce3c..e55cd5ce3c 100644
--- a/third_party/aom/examples/lightfield_encoder.c
+++ b/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
index 5556bf0e7d..5556bf0e7d 100644
--- a/third_party/aom/examples/lightfield_tile_list_decoder.c
+++ b/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
index 438ff21c61..438ff21c61 100644
--- a/third_party/aom/examples/lossless_encoder.c
+++ b/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
index 5cc6003b67..5cc6003b67 100644
--- a/third_party/aom/examples/noise_model.c
+++ b/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
index 6a84d57401..6a84d57401 100644
--- a/third_party/aom/examples/resize_util.c
+++ b/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
index c229242238..c229242238 100644
--- a/third_party/aom/examples/scalable_decoder.c
+++ b/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
index 7af03e29f5..7af03e29f5 100644
--- a/third_party/aom/examples/scalable_encoder.c
+++ b/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
index 9aeb96e437..9aeb96e437 100644
--- a/third_party/aom/examples/set_maps.c
+++ b/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
index d098d1e0b9..d098d1e0b9 100644
--- a/third_party/aom/examples/simple_decoder.c
+++ b/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
index 01a37cf0c9..01a37cf0c9 100644
--- a/third_party/aom/examples/simple_encoder.c
+++ b/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
index a03bc6cc2a..a03bc6cc2a 100644
--- a/third_party/aom/examples/twopass_encoder.c
+++ b/media/libaom/src/examples/twopass_encoder.c
diff --git a/third_party/aom/keywords.dox b/media/libaom/src/keywords.dox
index 56f5368900..56f5368900 100644
--- a/third_party/aom/keywords.dox
+++ b/media/libaom/src/keywords.dox
diff --git a/third_party/aom/libs.doxy_template b/media/libaom/src/libs.doxy_template
index c522e21d3a..c522e21d3a 100644
--- a/third_party/aom/libs.doxy_template
+++ b/media/libaom/src/libs.doxy_template
diff --git a/third_party/aom/mainpage.dox b/media/libaom/src/mainpage.dox
index 03a299ae1a..03a299ae1a 100644
--- a/third_party/aom/mainpage.dox
+++ b/media/libaom/src/mainpage.dox
diff --git a/third_party/aom/stats/aomstats.c b/media/libaom/src/stats/aomstats.c
index 4a15adf02c..4a15adf02c 100644
--- a/third_party/aom/stats/aomstats.c
+++ b/media/libaom/src/stats/aomstats.c
diff --git a/third_party/aom/stats/aomstats.h b/media/libaom/src/stats/aomstats.h
index b9c71871a0..b9c71871a0 100644
--- a/third_party/aom/stats/aomstats.h
+++ b/media/libaom/src/stats/aomstats.h
diff --git a/third_party/aom/stats/rate_hist.c b/media/libaom/src/stats/rate_hist.c
index 71eb78b720..71eb78b720 100644
--- a/third_party/aom/stats/rate_hist.c
+++ b/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
index 55b8c5d439..55b8c5d439 100644
--- a/third_party/aom/stats/rate_hist.h
+++ b/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
index 8b5c8af135..8b5c8af135 100644
--- a/third_party/aom/test/accounting_test.cc
+++ b/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
index 0a8317fd57..0a8317fd57 100644
--- a/third_party/aom/test/acm_random.h
+++ b/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
index a2b0546edb..a2b0546edb 100644
--- a/third_party/aom/test/active_map_test.cc
+++ b/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
index dabb1475a8..dabb1475a8 100644
--- a/third_party/aom/test/altref_test.cc
+++ b/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
index fe88a54e9e..fe88a54e9e 100644
--- a/third_party/aom/test/aom_integer_test.cc
+++ b/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
index f51b73c58e..f51b73c58e 100755..100644
--- a/third_party/aom/test/aomcx_set_ref.sh
+++ b/media/libaom/src/test/aomcx_set_ref.sh
diff --git a/third_party/aom/test/aomdec.sh b/media/libaom/src/test/aomdec.sh
index 927142287c..927142287c 100755..100644
--- a/third_party/aom/test/aomdec.sh
+++ b/media/libaom/src/test/aomdec.sh
diff --git a/third_party/aom/test/aomenc.sh b/media/libaom/src/test/aomenc.sh
index b030397a30..b030397a30 100755..100644
--- a/third_party/aom/test/aomenc.sh
+++ b/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
index bbb5027d4d..bbb5027d4d 100644
--- a/third_party/aom/test/aq_segment_test.cc
+++ b/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
index 083f4022f4..083f4022f4 100644
--- a/third_party/aom/test/arf_freq_test.cc
+++ b/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
index e2f2c53906..e2f2c53906 100644
--- a/third_party/aom/test/av1_config_test.cc
+++ b/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
index 03286260e8..03286260e8 100644
--- a/third_party/aom/test/av1_convolve_2d_test.cc
+++ b/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
index 409fd23e10..409fd23e10 100644
--- a/third_party/aom/test/av1_convolve_2d_test_util.cc
+++ b/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
index e0eb584108..e0eb584108 100644
--- a/third_party/aom/test/av1_convolve_2d_test_util.h
+++ b/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
index 3b1698eeb4..3b1698eeb4 100644
--- a/third_party/aom/test/av1_convolve_scale_test.cc
+++ b/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
index e8470e5d50..e8470e5d50 100644
--- a/third_party/aom/test/av1_encoder_parms_get_to_decoder.cc
+++ b/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
index 424d2f065f..424d2f065f 100644
--- a/third_party/aom/test/av1_ext_tile_test.cc
+++ b/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
index 49a6668793..49a6668793 100644
--- a/third_party/aom/test/av1_fwd_txfm1d_test.cc
+++ b/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
index 75f20536b2..75f20536b2 100644
--- a/third_party/aom/test/av1_fwd_txfm2d_test.cc
+++ b/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
index 2d6490c2ad..2d6490c2ad 100644
--- a/third_party/aom/test/av1_highbd_iht_test.cc
+++ b/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
index fd77ef35d7..fd77ef35d7 100644
--- a/third_party/aom/test/av1_horz_only_frame_superres_test.cc
+++ b/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
index bf3a44ed14..bf3a44ed14 100644
--- a/third_party/aom/test/av1_inv_txfm1d_test.cc
+++ b/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
index 11e231ba64..11e231ba64 100644
--- a/third_party/aom/test/av1_inv_txfm2d_test.cc
+++ b/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
index aaf0939181..aaf0939181 100644
--- a/third_party/aom/test/av1_quantize_test.cc
+++ b/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
index 181a394604..181a394604 100644
--- a/third_party/aom/test/av1_round_shift_array_test.cc
+++ b/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
index d5b0ce3255..d5b0ce3255 100644
--- a/third_party/aom/test/av1_txfm_test.cc
+++ b/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
index a181647411..a181647411 100644
--- a/third_party/aom/test/av1_txfm_test.h
+++ b/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
index e8fbe69a4c..e8fbe69a4c 100644
--- a/third_party/aom/test/av1_wedge_utils_test.cc
+++ b/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
index fe31a01cb9..fe31a01cb9 100755..100644
--- a/third_party/aom/test/best_encode.sh
+++ b/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
index 45660cf853..45660cf853 100644
--- a/third_party/aom/test/binary_codes_test.cc
+++ b/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
index f8844eef8b..f8844eef8b 100644
--- a/third_party/aom/test/blend_a64_mask_1d_test.cc
+++ b/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
index 66ca6fc5f3..66ca6fc5f3 100644
--- a/third_party/aom/test/blend_a64_mask_test.cc
+++ b/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
index ab624007ce..ab624007ce 100644
--- a/third_party/aom/test/blockd_test.cc
+++ b/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
index 680ec18774..680ec18774 100644
--- a/third_party/aom/test/boolcoder_test.cc
+++ b/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
index 893237ef30..893237ef30 100644
--- a/third_party/aom/test/borders_test.cc
+++ b/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
index becc072918..becc072918 100644
--- a/third_party/aom/test/cdef_test.cc
+++ b/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
index e4d438d6ab..e4d438d6ab 100644
--- a/third_party/aom/test/cfl_test.cc
+++ b/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
index d38ff5dd51..d38ff5dd51 100644
--- a/third_party/aom/test/clear_system_state.h
+++ b/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
index dd99110ee6..dd99110ee6 100644
--- a/third_party/aom/test/codec_factory.h
+++ b/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
index 6735236ccd..6735236ccd 100644
--- a/third_party/aom/test/coding_path_sync.cc
+++ b/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
index 9ad8973f08..9ad8973f08 100644
--- a/third_party/aom/test/comp_avg_pred_test.cc
+++ b/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
index 9661dd9f54..9661dd9f54 100644
--- a/third_party/aom/test/comp_avg_pred_test.h
+++ b/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
index 34be2aa6db..34be2aa6db 100644
--- a/third_party/aom/test/comp_mask_variance_test.cc
+++ b/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
index 2f801e7d46..2f801e7d46 100644
--- a/third_party/aom/test/convolve_round_test.cc
+++ b/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
index de3f47628a..de3f47628a 100644
--- a/third_party/aom/test/convolve_test.cc
+++ b/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
index 58e3139c5f..58e3139c5f 100644
--- a/third_party/aom/test/corner_match_test.cc
+++ b/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
index 8ea3e69650..8ea3e69650 100644
--- a/third_party/aom/test/cpu_speed_test.cc
+++ b/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
index 1588d3cc19..1588d3cc19 100644
--- a/third_party/aom/test/datarate_test.cc
+++ b/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
index c1beacee17..c1beacee17 100644
--- a/third_party/aom/test/decode_api_test.cc
+++ b/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
index cea1d144f1..cea1d144f1 100644
--- a/third_party/aom/test/decode_multithreaded_test.cc
+++ b/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
index bb7b00032e..bb7b00032e 100644
--- a/third_party/aom/test/decode_perf_test.cc
+++ b/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
index 70de0cff69..70de0cff69 100644
--- a/third_party/aom/test/decode_test_driver.cc
+++ b/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
index d13e13ea1f..d13e13ea1f 100644
--- a/third_party/aom/test/decode_test_driver.h
+++ b/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
index 2edd1cb52b..2edd1cb52b 100755..100644
--- a/third_party/aom/test/decode_to_md5.sh
+++ b/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
index 155ee92077..155ee92077 100755..100644
--- a/third_party/aom/test/decode_with_drops.sh
+++ b/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
index 064f8ee454..064f8ee454 100644
--- a/third_party/aom/test/divu_small_test.cc
+++ b/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
index ff2c1de4e9..ff2c1de4e9 100644
--- a/third_party/aom/test/dr_prediction_test.cc
+++ b/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
index da44dd7e67..da44dd7e67 100755..100644
--- a/third_party/aom/test/dump_obu.sh
+++ b/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
index e6a5ea63bf..e6a5ea63bf 100644
--- a/third_party/aom/test/ec_test.cc
+++ b/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
index c26f5720f2..c26f5720f2 100644
--- a/third_party/aom/test/encode_api_test.cc
+++ b/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
index fe649b1539..fe649b1539 100644
--- a/third_party/aom/test/encode_perf_test.cc
+++ b/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
index f3d61dc36a..f3d61dc36a 100644
--- a/third_party/aom/test/encode_test_driver.cc
+++ b/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
index 4f3f855cf9..4f3f855cf9 100644
--- a/third_party/aom/test/encode_test_driver.h
+++ b/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
index 11cc073682..11cc073682 100644
--- a/third_party/aom/test/encodetxb_test.cc
+++ b/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
index 1ac0ae9312..1ac0ae9312 100644
--- a/third_party/aom/test/end_to_end_test.cc
+++ b/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
index 353947c3d7..353947c3d7 100644
--- a/third_party/aom/test/error_block_test.cc
+++ b/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
index 13ac0bf93d..13ac0bf93d 100644
--- a/third_party/aom/test/error_resilience_test.cc
+++ b/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
index d9ac782828..d9ac782828 100644
--- a/third_party/aom/test/ethread_test.cc
+++ b/media/libaom/src/test/ethread_test.cc
diff --git a/third_party/aom/test/examples.sh b/media/libaom/src/test/examples.sh
index 2cdb89dd08..2cdb89dd08 100755..100644
--- a/third_party/aom/test/examples.sh
+++ b/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
index c2af059a4e..c2af059a4e 100644
--- a/third_party/aom/test/external_frame_buffer_test.cc
+++ b/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
index e24e451a33..e24e451a33 100644
--- a/third_party/aom/test/fft_test.cc
+++ b/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
index 524d67d7bc..524d67d7bc 100644
--- a/third_party/aom/test/film_grain_table_test.cc
+++ b/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
index 5971349406..5971349406 100644
--- a/third_party/aom/test/filterintra_test.cc
+++ b/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
index eaf0b8370a..eaf0b8370a 100644
--- a/third_party/aom/test/frame_size_tests.cc
+++ b/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
index f270689023..f270689023 100644
--- a/third_party/aom/test/function_equivalence_test.h
+++ b/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
index c8d98c5198..c8d98c5198 100644
--- a/third_party/aom/test/fwht4x4_test.cc
+++ b/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
index d3a443dabf..d3a443dabf 100755..100644
--- a/third_party/aom/test/gviz_api.py
+++ b/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
index e9f7f63c9b..e9f7f63c9b 100644
--- a/third_party/aom/test/hash_test.cc
+++ b/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
index 09df9bde47..09df9bde47 100644
--- a/third_party/aom/test/hbd_metrics_test.cc
+++ b/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
index f94a0730c1..f94a0730c1 100644
--- a/third_party/aom/test/hiprec_convolve_test.cc
+++ b/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
index 2672bcec3d..2672bcec3d 100644
--- a/third_party/aom/test/hiprec_convolve_test_util.cc
+++ b/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
index 2abe24b57e..2abe24b57e 100644
--- a/third_party/aom/test/hiprec_convolve_test_util.h
+++ b/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
index 973f55b668..973f55b668 100644
--- a/third_party/aom/test/horz_superres_test.cc
+++ b/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
index 233e7152b9..233e7152b9 100644
--- a/third_party/aom/test/i420_video_source.h
+++ b/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
index ce61402acb..ce61402acb 100644
--- a/third_party/aom/test/intra_edge_test.cc
+++ b/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
index 3ea4217081..3ea4217081 100644
--- a/third_party/aom/test/intrabc_test.cc
+++ b/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
index 1a1c0fc421..1a1c0fc421 100644
--- a/third_party/aom/test/intrapred_test.cc
+++ b/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
index 5b4f5a6c3d..5b4f5a6c3d 100644
--- a/third_party/aom/test/invalid_file_test.cc
+++ b/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
index ff2841445e..ff2841445e 100644
--- a/third_party/aom/test/ivf_video_source.h
+++ b/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
index b957a6b794..b957a6b794 100755..100644
--- a/third_party/aom/test/lightfield_test.sh
+++ b/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
index d7840c68b2..d7840c68b2 100644
--- a/third_party/aom/test/log2_test.cc
+++ b/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
index 3f8e89c815..3f8e89c815 100644
--- a/third_party/aom/test/lossless_test.cc
+++ b/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
index 451bffd2a2..451bffd2a2 100644
--- a/third_party/aom/test/lpf_test.cc
+++ b/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
index 311f1877d4..311f1877d4 100644
--- a/third_party/aom/test/masked_sad_test.cc
+++ b/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
index 275b9feb6a..275b9feb6a 100644
--- a/third_party/aom/test/masked_variance_test.cc
+++ b/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
index 9443cb2624..9443cb2624 100644
--- a/third_party/aom/test/md5_helper.h
+++ b/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
index b57c62314a..b57c62314a 100644
--- a/third_party/aom/test/metrics_template.html
+++ b/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
index ebccba5842..ebccba5842 100644
--- a/third_party/aom/test/monochrome_test.cc
+++ b/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
index 27eb938930..27eb938930 100644
--- a/third_party/aom/test/motion_vector_test.cc
+++ b/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
index b5b387e313..b5b387e313 100644
--- a/third_party/aom/test/noise_model_test.cc
+++ b/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
index 6cef869618..6cef869618 100644
--- a/third_party/aom/test/obmc_sad_test.cc
+++ b/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
index 4563b964aa..4563b964aa 100644
--- a/third_party/aom/test/obmc_variance_test.cc
+++ b/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
index 3889595187..3889595187 100644
--- a/third_party/aom/test/onyxc_int_test.cc
+++ b/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
index 040e8e8b76..040e8e8b76 100644
--- a/third_party/aom/test/pickrst_test.cc
+++ b/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
index c87506b41a..c87506b41a 100644
--- a/third_party/aom/test/qm_test.cc
+++ b/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
index 554d0c7214..554d0c7214 100644
--- a/third_party/aom/test/quantize_func_test.cc
+++ b/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
index a8536e517c..a8536e517c 100644
--- a/third_party/aom/test/reconinter_test.cc
+++ b/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
index d404621dd7..d404621dd7 100644
--- a/third_party/aom/test/register_state_check.h
+++ b/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
index b270b8362f..b270b8362f 100644
--- a/third_party/aom/test/resize_test.cc
+++ b/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
index 2096d8b158..2096d8b158 100755..100644
--- a/third_party/aom/test/run_encodes.sh
+++ b/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
index 845fe79da1..845fe79da1 100644
--- a/third_party/aom/test/sad_test.cc
+++ b/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
index b399188617..b399188617 100644
--- a/third_party/aom/test/scalability_test.cc
+++ b/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
index dee2ab5a69..dee2ab5a69 100644
--- a/third_party/aom/test/scan_test.cc
+++ b/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
index bd8cf11410..bd8cf11410 100644
--- a/third_party/aom/test/segment_binarization_sync.cc
+++ b/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
index d2d5c6105d..d2d5c6105d 100644
--- a/third_party/aom/test/selfguided_filter_test.cc
+++ b/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
index 4f59b06d69..4f59b06d69 100755..100644
--- a/third_party/aom/test/set_maps.sh
+++ b/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
index 8a012bff88..8a012bff88 100644
--- a/third_party/aom/test/simd_avx2_test.cc
+++ b/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
index cda632bcdf..cda632bcdf 100644
--- a/third_party/aom/test/simd_cmp_avx2.cc
+++ b/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
index b98af9aade..b98af9aade 100644
--- a/third_party/aom/test/simd_cmp_impl.h
+++ b/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
index 53c1e2a07f..53c1e2a07f 100644
--- a/third_party/aom/test/simd_cmp_neon.cc
+++ b/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
index f7827a7fa1..f7827a7fa1 100644
--- a/third_party/aom/test/simd_cmp_sse2.cc
+++ b/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
index 3566764b64..3566764b64 100644
--- a/third_party/aom/test/simd_cmp_sse4.cc
+++ b/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
index 57bf135ddb..57bf135ddb 100644
--- a/third_party/aom/test/simd_cmp_ssse3.cc
+++ b/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
index fd06f67fdf..fd06f67fdf 100644
--- a/third_party/aom/test/simd_impl.h
+++ b/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
index b67b188959..b67b188959 100644
--- a/third_party/aom/test/simd_neon_test.cc
+++ b/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
index b37a931b38..b37a931b38 100644
--- a/third_party/aom/test/simd_sse2_test.cc
+++ b/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
index b1c9d5cd88..b1c9d5cd88 100644
--- a/third_party/aom/test/simd_sse4_test.cc
+++ b/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
index d95c26fb5e..d95c26fb5e 100644
--- a/third_party/aom/test/simd_ssse3_test.cc
+++ b/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
index 5f39ad206e..5f39ad206e 100755..100644
--- a/third_party/aom/test/simple_decoder.sh
+++ b/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
index 5cd6b46a10..5cd6b46a10 100755..100644
--- a/third_party/aom/test/simple_encoder.sh
+++ b/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
index 7dcedf56de..7dcedf56de 100644
--- a/third_party/aom/test/subtract_test.cc
+++ b/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
index f109984986..f109984986 100644
--- a/third_party/aom/test/sum_squares_test.cc
+++ b/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
index 7be18f72a3..7be18f72a3 100644
--- a/third_party/aom/test/superframe_test.cc
+++ b/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
index b6ee34701a..b6ee34701a 100644
--- a/third_party/aom/test/test-data.sha1
+++ b/media/libaom/src/test/test-data.sha1
diff --git a/third_party/aom/test/test.cmake b/media/libaom/src/test/test.cmake
index b16ae14c3d..b16ae14c3d 100644
--- a/third_party/aom/test/test.cmake
+++ b/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
index dc803497da..dc803497da 100644
--- a/third_party/aom/test/test_data_download_worker.cmake
+++ b/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
index 45c951478a..45c951478a 100644
--- a/third_party/aom/test/test_data_util.cmake
+++ b/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
index b72ac11674..b72ac11674 100644
--- a/third_party/aom/test/test_intra_pred_speed.cc
+++ b/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
index b55d762373..b55d762373 100644
--- a/third_party/aom/test/test_libaom.cc
+++ b/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
index d3747b1e30..d3747b1e30 100644
--- a/third_party/aom/test/test_runner.cmake
+++ b/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
index 286988b170..286988b170 100644
--- a/third_party/aom/test/test_vector_test.cc
+++ b/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
index 71e431e18b..71e431e18b 100644
--- a/third_party/aom/test/test_vectors.cc
+++ b/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
index be37f6e377..be37f6e377 100644
--- a/third_party/aom/test/test_vectors.h
+++ b/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
index cf534c0c59..cf534c0c59 100644
--- a/third_party/aom/test/tile_independence_test.cc
+++ b/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
index c087106060..c087106060 100755..100644
--- a/third_party/aom/test/tools_common.sh
+++ b/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
index 8ebcf5ff7c..8ebcf5ff7c 100644
--- a/third_party/aom/test/transform_test_base.h
+++ b/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
index cca44ced8a..cca44ced8a 100755..100644
--- a/third_party/aom/test/twopass_encoder.sh
+++ b/media/libaom/src/test/twopass_encoder.sh
diff --git a/third_party/aom/test/util.h b/media/libaom/src/test/util.h
index c3f4e44421..c3f4e44421 100644
--- a/third_party/aom/test/util.h
+++ b/media/libaom/src/test/util.h
diff --git a/third_party/aom/test/variance_test.cc b/media/libaom/src/test/variance_test.cc
index 0df314b0fd..0df314b0fd 100644
--- a/third_party/aom/test/variance_test.cc
+++ b/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
index 3c1c5e559e..3c1c5e559e 100644
--- a/third_party/aom/test/video_source.h
+++ b/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
index 9055feb334..9055feb334 100755..100644
--- a/third_party/aom/test/visual_metrics.py
+++ b/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
index 19a4e8b6a1..19a4e8b6a1 100644
--- a/third_party/aom/test/warp_filter_test.cc
+++ b/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
index 69b2ed4afe..69b2ed4afe 100644
--- a/third_party/aom/test/warp_filter_test_util.cc
+++ b/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
index b8998e5c8e..b8998e5c8e 100644
--- a/third_party/aom/test/warp_filter_test_util.h
+++ b/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
index bb3d117355..bb3d117355 100644
--- a/third_party/aom/test/webm_video_source.h
+++ b/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
index dfec09119d..dfec09119d 100644
--- a/third_party/aom/test/wiener_test.cc
+++ b/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
index 6cc75ef5b0..6cc75ef5b0 100644
--- a/third_party/aom/test/y4m_test.cc
+++ b/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
index 3dea901e6d..3dea901e6d 100644
--- a/third_party/aom/test/y4m_video_source.h
+++ b/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
index 774ecc0086..774ecc0086 100644
--- a/third_party/aom/test/yuv_video_source.h
+++ b/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
index f347008d6e..f347008d6e 100644
--- a/third_party/aom/third_party/fastfeat/LICENSE
+++ b/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
index 1e58a303b9..1e58a303b9 100644
--- a/third_party/aom/third_party/fastfeat/README.libvpx
+++ b/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
index 0d7efc154d..0d7efc154d 100644
--- a/third_party/aom/third_party/fastfeat/fast.c
+++ b/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
index a00730e3d3..a00730e3d3 100644
--- a/third_party/aom/third_party/fastfeat/fast.h
+++ b/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
index ec167a9533..ec167a9533 100644
--- a/third_party/aom/third_party/fastfeat/fast_9.c
+++ b/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
index 0438c4dc18..0438c4dc18 100644
--- a/third_party/aom/third_party/fastfeat/nonmax.c
+++ b/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
index 9784dd51b5..9784dd51b5 100644
--- a/third_party/aom/third_party/googletest/README.libaom
+++ b/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
index fc4dbdc240..fc4dbdc240 100644
--- a/third_party/aom/third_party/googletest/gtest.mk
+++ b/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
index 0552132421..0552132421 100644
--- a/third_party/aom/third_party/googletest/src/googletest/CHANGES
+++ b/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
index 621d0f0421..621d0f0421 100644
--- a/third_party/aom/third_party/googletest/src/googletest/CMakeLists.txt
+++ b/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
index feae2fc044..feae2fc044 100644
--- a/third_party/aom/third_party/googletest/src/googletest/CONTRIBUTORS
+++ b/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
index 1941a11f8c..1941a11f8c 100644
--- a/third_party/aom/third_party/googletest/src/googletest/LICENSE
+++ b/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
index edd4408054..edd4408054 100644
--- a/third_party/aom/third_party/googletest/src/googletest/README.md
+++ b/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
index 777b91ed4b..777b91ed4b 100644
--- 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
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
index 957a69c6a9..957a69c6a9 100644
--- 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
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
index fe879bca79..fe879bca79 100644
--- 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
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
index 038f9ba79e..038f9ba79e 100644
--- 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
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
index 3078d6d2a1..3078d6d2a1 100644
--- 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
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
index 8a33164cb3..8a33164cb3 100644
--- 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
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
index f63fa9a1b2..f63fa9a1b2 100644
--- 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
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
index 77eb844839..77eb844839 100644
--- 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
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
index 5f69d5678e..5f69d5678e 100644
--- 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
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
index f846c5bd66..f846c5bd66 100644
--- 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
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
index 30ae712f50..30ae712f50 100644
--- 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
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
index da80ddc6c7..da80ddc6c7 100644
--- 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
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
index 7e744bd3bb..7e744bd3bb 100644
--- 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
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
index 60c1ea050b..60c1ea050b 100644
--- 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
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
index c27412a898..c27412a898 100644
--- 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
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
index 2b3a78f5bf..2b3a78f5bf 100644
--- 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
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
index 7a13b4b0de..7a13b4b0de 100644
--- 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
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
index ebd1cf615d..ebd1cf615d 100644
--- 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
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
index 3602942217..3602942217 100644
--- 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
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
index 4d1d81d20f..4d1d81d20f 100644
--- 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
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
index 5c7c47af0b..5c7c47af0b 100644
--- 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
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
index 82cab9b020..82cab9b020 100644
--- 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
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
index 74ab949057..74ab949057 100644
--- 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
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
index da57e65d33..da57e65d33 100644
--- 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
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
index 97f1a7fdd2..97f1a7fdd2 100644
--- 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
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
index e9b405340a..e9b405340a 100644
--- 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
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
index 429ddfeeca..429ddfeeca 100644
--- 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
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
index e46f7cfcb4..e46f7cfcb4 100644
--- 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
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
index 251fdf025b..251fdf025b 100644
--- 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
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
index 0a9cee5223..0a9cee5223 100644
--- 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
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
index a01a369830..a01a369830 100644
--- 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
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
index 0292dc1195..0292dc1195 100644
--- 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
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
index ed8a682a96..ed8a682a96 100644
--- 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
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
index e5bf3dd2be..e5bf3dd2be 100644
--- 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
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
index a2df412f8a..a2df412f8a 100644
--- 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
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
index fb0e35425e..fb0e35425e 100644
--- 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
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
index df1eef4754..df1eef4754 100644
--- 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
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
index 5a8932c73e..5a8932c73e 100644
--- a/third_party/aom/third_party/googletest/src/googletest/src/gtest.cc
+++ b/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
index f302822552..f302822552 100644
--- 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
diff --git a/third_party/aom/third_party/libwebm/AUTHORS.TXT b/media/libaom/src/third_party/libwebm/AUTHORS.TXT
index 9686ac13eb..9686ac13eb 100644
--- a/third_party/aom/third_party/libwebm/AUTHORS.TXT
+++ b/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
index b46ba101d4..b46ba101d4 100644
--- a/third_party/aom/third_party/libwebm/Android.mk
+++ b/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
index 7a6f99547d..7a6f99547d 100644
--- a/third_party/aom/third_party/libwebm/LICENSE.TXT
+++ b/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
index caedf607e9..caedf607e9 100644
--- a/third_party/aom/third_party/libwebm/PATENTS.TXT
+++ b/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
index bd288d201d..bd288d201d 100644
--- a/third_party/aom/third_party/libwebm/README.libaom
+++ b/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
index 618ffc087f..618ffc087f 100644
--- a/third_party/aom/third_party/libwebm/common/file_util.cc
+++ b/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
index a873734641..a873734641 100644
--- a/third_party/aom/third_party/libwebm/common/file_util.h
+++ b/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
index 916f7170b6..916f7170b6 100644
--- a/third_party/aom/third_party/libwebm/common/hdr_util.cc
+++ b/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
index 78e2eeb705..78e2eeb705 100644
--- a/third_party/aom/third_party/libwebm/common/hdr_util.h
+++ b/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
index 89d722a71b..89d722a71b 100644
--- a/third_party/aom/third_party/libwebm/common/webmids.h
+++ b/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
index bae2c99b87..bae2c99b87 100644
--- a/third_party/aom/third_party/libwebm/mkvmuxer/mkvmuxer.cc
+++ b/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
index 9e817bced4..9e817bced4 100644
--- a/third_party/aom/third_party/libwebm/mkvmuxer/mkvmuxer.h
+++ b/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
index e5db121605..e5db121605 100644
--- a/third_party/aom/third_party/libwebm/mkvmuxer/mkvmuxertypes.h
+++ b/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
index 355d4e22b3..355d4e22b3 100644
--- a/third_party/aom/third_party/libwebm/mkvmuxer/mkvmuxerutil.cc
+++ b/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
index 132388da59..132388da59 100644
--- a/third_party/aom/third_party/libwebm/mkvmuxer/mkvmuxerutil.h
+++ b/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
index 84655d802a..84655d802a 100644
--- a/third_party/aom/third_party/libwebm/mkvmuxer/mkvwriter.cc
+++ b/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
index 4227c63748..4227c63748 100644
--- a/third_party/aom/third_party/libwebm/mkvmuxer/mkvwriter.h
+++ b/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
index e7b76f7da1..e7b76f7da1 100644
--- a/third_party/aom/third_party/libwebm/mkvparser/mkvparser.cc
+++ b/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
index 26c2b7e5eb..26c2b7e5eb 100644
--- a/third_party/aom/third_party/libwebm/mkvparser/mkvparser.h
+++ b/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
index 23d68f5089..23d68f5089 100644
--- a/third_party/aom/third_party/libwebm/mkvparser/mkvreader.cc
+++ b/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
index 9831ecf645..9831ecf645 100644
--- a/third_party/aom/third_party/libwebm/mkvparser/mkvreader.h
+++ b/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
index 09693c1f2c..09693c1f2c 100644
--- a/third_party/aom/third_party/libyuv/README.libaom
+++ b/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
index 66e68536cb..66e68536cb 100644
--- a/third_party/aom/third_party/libyuv/include/libyuv/basic_types.h
+++ b/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
index 2a9f1560ce..2a9f1560ce 100644
--- a/third_party/aom/third_party/libyuv/include/libyuv/compare.h
+++ b/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
index d6f206c10f..d6f206c10f 100644
--- a/third_party/aom/third_party/libyuv/include/libyuv/convert.h
+++ b/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
index ea75c0b26a..ea75c0b26a 100644
--- a/third_party/aom/third_party/libyuv/include/libyuv/convert_argb.h
+++ b/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
index 3591b4fd6a..3591b4fd6a 100644
--- a/third_party/aom/third_party/libyuv/include/libyuv/convert_from.h
+++ b/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
index 4a62268138..4a62268138 100644
--- 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
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
index 870e94e8cd..870e94e8cd 100644
--- a/third_party/aom/third_party/libyuv/include/libyuv/cpu_id.h
+++ b/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
index fa1e51f9ac..fa1e51f9ac 100644
--- a/third_party/aom/third_party/libyuv/include/libyuv/mjpeg_decoder.h
+++ b/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
index 7fe4d8eedd..7fe4d8eedd 100644
--- a/third_party/aom/third_party/libyuv/include/libyuv/planar_functions.h
+++ b/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
index 8a9673f280..8a9673f280 100644
--- a/third_party/aom/third_party/libyuv/include/libyuv/rotate.h
+++ b/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
index 2bdc8ec6b4..2bdc8ec6b4 100644
--- a/third_party/aom/third_party/libyuv/include/libyuv/rotate_argb.h
+++ b/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
index d0bfbdd2b0..d0bfbdd2b0 100644
--- a/third_party/aom/third_party/libyuv/include/libyuv/rotate_row.h
+++ b/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
index 5c3187ef79..5c3187ef79 100644
--- a/third_party/aom/third_party/libyuv/include/libyuv/row.h
+++ b/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
index 3974aba34e..3974aba34e 100644
--- a/third_party/aom/third_party/libyuv/include/libyuv/scale.h
+++ b/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
index 22563837dd..22563837dd 100644
--- a/third_party/aom/third_party/libyuv/include/libyuv/scale_argb.h
+++ b/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
index a46b5ce692..a46b5ce692 100644
--- a/third_party/aom/third_party/libyuv/include/libyuv/scale_row.h
+++ b/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
index 287b98ebf2..287b98ebf2 100644
--- a/third_party/aom/third_party/libyuv/include/libyuv/version.h
+++ b/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
index 7b0a19cc90..7b0a19cc90 100644
--- a/third_party/aom/third_party/libyuv/include/libyuv/video_common.h
+++ b/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
index 46aa8473d2..46aa8473d2 100644
--- a/third_party/aom/third_party/libyuv/source/compare.cc
+++ b/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
index c546b51829..c546b51829 100644
--- a/third_party/aom/third_party/libyuv/source/compare_common.cc
+++ b/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
index 247cb33bba..247cb33bba 100644
--- a/third_party/aom/third_party/libyuv/source/compare_gcc.cc
+++ b/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
index ef006ec41c..ef006ec41c 100644
--- a/third_party/aom/third_party/libyuv/source/compare_neon.cc
+++ b/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
index 6d1e5e1bc9..6d1e5e1bc9 100644
--- a/third_party/aom/third_party/libyuv/source/compare_neon64.cc
+++ b/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
index 19806f2750..19806f2750 100644
--- a/third_party/aom/third_party/libyuv/source/compare_win.cc
+++ b/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
index 3ad6bd7a4b..3ad6bd7a4b 100644
--- a/third_party/aom/third_party/libyuv/source/convert.cc
+++ b/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
index 44756bc41c..44756bc41c 100644
--- a/third_party/aom/third_party/libyuv/source/convert_argb.cc
+++ b/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
index 31f1ac992a..31f1ac992a 100644
--- a/third_party/aom/third_party/libyuv/source/convert_from.cc
+++ b/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
index 8d1e97aec2..8d1e97aec2 100644
--- a/third_party/aom/third_party/libyuv/source/convert_from_argb.cc
+++ b/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
index bcb980f7f1..bcb980f7f1 100644
--- a/third_party/aom/third_party/libyuv/source/convert_jpeg.cc
+++ b/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
index af829fbd32..af829fbd32 100644
--- a/third_party/aom/third_party/libyuv/source/convert_to_argb.cc
+++ b/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
index 5e75369b55..5e75369b55 100644
--- a/third_party/aom/third_party/libyuv/source/convert_to_i420.cc
+++ b/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
index 72f686e3b3..72f686e3b3 100644
--- a/third_party/aom/third_party/libyuv/source/cpu_id.cc
+++ b/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
index 75f8a610e3..75f8a610e3 100644
--- a/third_party/aom/third_party/libyuv/source/mjpeg_decoder.cc
+++ b/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
index 8edfbe1e74..8edfbe1e74 100644
--- a/third_party/aom/third_party/libyuv/source/mjpeg_validate.cc
+++ b/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
index b96bd50206..b96bd50206 100644
--- a/third_party/aom/third_party/libyuv/source/planar_functions.cc
+++ b/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
index be3d589207..be3d589207 100644
--- a/third_party/aom/third_party/libyuv/source/rotate.cc
+++ b/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
index 4d6eb34e18..4d6eb34e18 100644
--- a/third_party/aom/third_party/libyuv/source/rotate_any.cc
+++ b/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
index 787c0ad1be..787c0ad1be 100644
--- a/third_party/aom/third_party/libyuv/source/rotate_argb.cc
+++ b/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
index b33a9a0c6e..b33a9a0c6e 100644
--- a/third_party/aom/third_party/libyuv/source/rotate_common.cc
+++ b/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
index fd385bcd30..fd385bcd30 100644
--- a/third_party/aom/third_party/libyuv/source/rotate_gcc.cc
+++ b/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
index efe6bd909e..efe6bd909e 100644
--- a/third_party/aom/third_party/libyuv/source/rotate_mips.cc
+++ b/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
index 76043b3b3c..76043b3b3c 100644
--- a/third_party/aom/third_party/libyuv/source/rotate_neon.cc
+++ b/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
index f52c082b3f..f52c082b3f 100644
--- a/third_party/aom/third_party/libyuv/source/rotate_neon64.cc
+++ b/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
index 2760066dfd..2760066dfd 100644
--- a/third_party/aom/third_party/libyuv/source/rotate_win.cc
+++ b/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
index 1cb1f6b930..1cb1f6b930 100644
--- a/third_party/aom/third_party/libyuv/source/row_any.cc
+++ b/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
index 49875894fe..49875894fe 100644
--- a/third_party/aom/third_party/libyuv/source/row_common.cc
+++ b/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
index 820de0a1c6..820de0a1c6 100644
--- a/third_party/aom/third_party/libyuv/source/row_gcc.cc
+++ b/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
index cfc9ffe036..cfc9ffe036 100644
--- a/third_party/aom/third_party/libyuv/source/row_mips.cc
+++ b/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
index 1a72eb9039..1a72eb9039 100644
--- a/third_party/aom/third_party/libyuv/source/row_neon.cc
+++ b/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
index 5d015454b0..5d015454b0 100644
--- a/third_party/aom/third_party/libyuv/source/row_neon64.cc
+++ b/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
index 71be268b47..71be268b47 100644
--- a/third_party/aom/third_party/libyuv/source/row_win.cc
+++ b/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
index 0cb326f8e5..0cb326f8e5 100644
--- a/third_party/aom/third_party/libyuv/source/row_x86.asm
+++ b/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
index 0a01304c41..0a01304c41 100644
--- a/third_party/aom/third_party/libyuv/source/scale.cc
+++ b/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
index 2f6a2c8baf..2f6a2c8baf 100644
--- a/third_party/aom/third_party/libyuv/source/scale_any.cc
+++ b/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
index 40a2d1ab20..40a2d1ab20 100644
--- a/third_party/aom/third_party/libyuv/source/scale_argb.cc
+++ b/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
index 1711f3d54c..1711f3d54c 100644
--- a/third_party/aom/third_party/libyuv/source/scale_common.cc
+++ b/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
index 8a6ac54592..8a6ac54592 100644
--- a/third_party/aom/third_party/libyuv/source/scale_gcc.cc
+++ b/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
index 3eb4f27c45..3eb4f27c45 100644
--- a/third_party/aom/third_party/libyuv/source/scale_mips.cc
+++ b/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
index 7825878e98..7825878e98 100644
--- a/third_party/aom/third_party/libyuv/source/scale_neon.cc
+++ b/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
index 1d55193579..1d55193579 100644
--- a/third_party/aom/third_party/libyuv/source/scale_neon64.cc
+++ b/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
index c3896ebad2..c3896ebad2 100644
--- a/third_party/aom/third_party/libyuv/source/scale_win.cc
+++ b/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
index 379a0669ae..379a0669ae 100644
--- a/third_party/aom/third_party/libyuv/source/video_common.cc
+++ b/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
index cb5c32df3a..cb5c32df3a 100644
--- a/third_party/aom/third_party/libyuv/source/x86inc.asm
+++ b/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
index afcb9f00a5..afcb9f00a5 100644
--- a/third_party/aom/third_party/vector/LICENSE
+++ b/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
index 2bb8b2d5d5..2bb8b2d5d5 100644
--- a/third_party/aom/third_party/vector/README.libaom
+++ b/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
index fe46246a1d..fe46246a1d 100644
--- a/third_party/aom/third_party/vector/vector.c
+++ b/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
index 02743f5f16..02743f5f16 100644
--- a/third_party/aom/third_party/vector/vector.h
+++ b/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
index 7d07645a17..7d07645a17 100644
--- a/third_party/aom/third_party/x86inc/LICENSE
+++ b/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
index 07c4dad20a..07c4dad20a 100644
--- a/third_party/aom/third_party/x86inc/README.libaom
+++ b/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
index adaf2d99e9..adaf2d99e9 100644
--- a/third_party/aom/third_party/x86inc/x86inc.asm
+++ b/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
index 7cb4d18e18..7cb4d18e18 100644
--- a/third_party/aom/tools/aggregate_entropy_stats.py
+++ b/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
index 551adf4f29..551adf4f29 100644
--- a/third_party/aom/tools/aom_entropy_optimizer.c
+++ b/media/libaom/src/tools/aom_entropy_optimizer.c
diff --git a/third_party/aom/tools/cpplint.py b/media/libaom/src/tools/cpplint.py
index 25fbef73d8..25fbef73d8 100755..100644
--- a/third_party/aom/tools/cpplint.py
+++ b/media/libaom/src/tools/cpplint.py
diff --git a/third_party/aom/tools/diff.py b/media/libaom/src/tools/diff.py
index bac6aabdc0..bac6aabdc0 100644
--- a/third_party/aom/tools/diff.py
+++ b/media/libaom/src/tools/diff.py
diff --git a/third_party/aom/tools/dump_obu.cc b/media/libaom/src/tools/dump_obu.cc
index 30ee5e7a13..30ee5e7a13 100644
--- a/third_party/aom/tools/dump_obu.cc
+++ b/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
index 5def8bc898..5def8bc898 100755..100644
--- a/third_party/aom/tools/gen_authors.sh
+++ b/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
index 5d12ee1ef5..5d12ee1ef5 100755..100644
--- a/third_party/aom/tools/gen_constrained_tokenset.py
+++ b/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
index a14c08111a..a14c08111a 100644
--- a/third_party/aom/tools/inspect-cli.js
+++ b/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
index 31c40bb82c..31c40bb82c 100644
--- a/third_party/aom/tools/inspect-post.js
+++ b/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
index df13c4ef70..df13c4ef70 100755..100644
--- a/third_party/aom/tools/intersect-diffs.py
+++ b/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
index d02bee16ce..d02bee16ce 100755..100644
--- a/third_party/aom/tools/lint-hunks.py
+++ b/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
index 7d71386ce4..7d71386ce4 100644
--- a/third_party/aom/tools/obu_parser.cc
+++ b/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
index 1d7d2d794b..1d7d2d794b 100644
--- a/third_party/aom/tools/obu_parser.h
+++ b/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
index 7c5400b91a..7c5400b91a 100644
--- a/third_party/aom/tools/txfm_analyzer/txfm_gen_code.cc
+++ b/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
index a249061008..a249061008 100644
--- a/third_party/aom/tools/txfm_analyzer/txfm_graph.cc
+++ b/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
index 2e3c9551e2..2e3c9551e2 100644
--- a/third_party/aom/tools/txfm_analyzer/txfm_graph.h
+++ b/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
index 1c78824439..1c78824439 100755..100644
--- a/third_party/aom/tools/wrap-commit-msg.py
+++ b/media/libaom/src/tools/wrap-commit-msg.py
diff --git a/third_party/aom/usage.dox b/media/libaom/src/usage.dox
index 062d35a838..062d35a838 100644
--- a/third_party/aom/usage.dox
+++ b/media/libaom/src/usage.dox
diff --git a/third_party/aom/usage_cx.dox b/media/libaom/src/usage_cx.dox
index 51b4e8e3e2..51b4e8e3e2 100644
--- a/third_party/aom/usage_cx.dox
+++ b/media/libaom/src/usage_cx.dox
diff --git a/third_party/aom/usage_dx.dox b/media/libaom/src/usage_dx.dox
index eef78376f7..eef78376f7 100644
--- a/third_party/aom/usage_dx.dox
+++ b/media/libaom/src/usage_dx.dox