1150 files changed, 571 insertions, 575 deletions

diff --git a/config/external/moz.build b/config/external/moz.build
index 6d04d0804..7cd201a07 100644
--- a/config/external/moz.build
+++ b/config/external/moz.build
@@ -7,9 +7,6 @@ external_dirs = []
 
 DIRS += ['lgpllibs']
 
-if CONFIG['MOZ_AV1']:
-    external_dirs += ['media/libaom']
-
 if CONFIG['MOZ_FFVPX']:
     external_dirs += ['media/ffvpx']
 
diff --git a/media/libaom/README_MCP b/libs/libaom/README_MCP
index ad04810a3..c29314da2 100644
--- a/media/libaom/README_MCP
+++ b/libs/libaom/README_MCP
@@ -2,7 +2,7 @@ This directory contains build files for the aom video
 codec reference implementation.
 
 Any patches or additional configuration to be applied to the
-upstream source should be kept here in the media/libaom
+upstream source should be kept here in the libs/libaom
 directory.
 
 The upstream aom git repository is:
diff --git a/media/libaom/aom_version.h b/libs/libaom/aom_version.h
index 92de763be..92de763be 100644
--- a/media/libaom/aom_version.h
+++ b/libs/libaom/aom_version.h
diff --git a/media/libaom/cmakeparser.py b/libs/libaom/cmakeparser.py
index cb2686a61..cb2686a61 100644
--- a/media/libaom/cmakeparser.py
+++ b/libs/libaom/cmakeparser.py
diff --git a/media/libaom/config/aom_version.h b/libs/libaom/config/aom_version.h
index 92de763be..92de763be 100644
--- a/media/libaom/config/aom_version.h
+++ b/libs/libaom/config/aom_version.h
diff --git a/media/libaom/config/generic/config/aom_config.asm b/libs/libaom/config/generic/config/aom_config.asm
index af2521fa4..af2521fa4 100644
--- a/media/libaom/config/generic/config/aom_config.asm
+++ b/libs/libaom/config/generic/config/aom_config.asm
diff --git a/media/libaom/config/generic/config/aom_config.h b/libs/libaom/config/generic/config/aom_config.h
index 6e300df37..6e300df37 100644
--- a/media/libaom/config/generic/config/aom_config.h
+++ b/libs/libaom/config/generic/config/aom_config.h
diff --git a/media/libaom/config/generic/config/aom_dsp_rtcd.h b/libs/libaom/config/generic/config/aom_dsp_rtcd.h
index f769d1180..f769d1180 100644
--- a/media/libaom/config/generic/config/aom_dsp_rtcd.h
+++ b/libs/libaom/config/generic/config/aom_dsp_rtcd.h
diff --git a/media/libaom/config/generic/config/aom_scale_rtcd.h b/libs/libaom/config/generic/config/aom_scale_rtcd.h
index 46b018d86..46b018d86 100644
--- a/media/libaom/config/generic/config/aom_scale_rtcd.h
+++ b/libs/libaom/config/generic/config/aom_scale_rtcd.h
diff --git a/media/libaom/config/generic/config/av1_rtcd.h b/libs/libaom/config/generic/config/av1_rtcd.h
index dd8536b69..dd8536b69 100644
--- a/media/libaom/config/generic/config/av1_rtcd.h
+++ b/libs/libaom/config/generic/config/av1_rtcd.h
diff --git a/media/libaom/config/linux/arm/config/aom_config.asm b/libs/libaom/config/linux/arm/config/aom_config.asm
index a5d8cc9b9..a5d8cc9b9 100644
--- a/media/libaom/config/linux/arm/config/aom_config.asm
+++ b/libs/libaom/config/linux/arm/config/aom_config.asm
diff --git a/media/libaom/config/linux/arm/config/aom_config.h b/libs/libaom/config/linux/arm/config/aom_config.h
index 5fc909a91..5fc909a91 100644
--- a/media/libaom/config/linux/arm/config/aom_config.h
+++ b/libs/libaom/config/linux/arm/config/aom_config.h
diff --git a/media/libaom/config/linux/arm/config/aom_dsp_rtcd.h b/libs/libaom/config/linux/arm/config/aom_dsp_rtcd.h
index c6e420acb..c6e420acb 100644
--- a/media/libaom/config/linux/arm/config/aom_dsp_rtcd.h
+++ b/libs/libaom/config/linux/arm/config/aom_dsp_rtcd.h
diff --git a/media/libaom/config/linux/arm/config/aom_scale_rtcd.h b/libs/libaom/config/linux/arm/config/aom_scale_rtcd.h
index 067ddb492..067ddb492 100644
--- a/media/libaom/config/linux/arm/config/aom_scale_rtcd.h
+++ b/libs/libaom/config/linux/arm/config/aom_scale_rtcd.h
diff --git a/media/libaom/config/linux/arm/config/av1_rtcd.h b/libs/libaom/config/linux/arm/config/av1_rtcd.h
index 7a346efd2..7a346efd2 100644
--- a/media/libaom/config/linux/arm/config/av1_rtcd.h
+++ b/libs/libaom/config/linux/arm/config/av1_rtcd.h
diff --git a/media/libaom/config/linux/ia32/config/aom_config.asm b/libs/libaom/config/linux/ia32/config/aom_config.asm
index 591f86e6c..591f86e6c 100644
--- a/media/libaom/config/linux/ia32/config/aom_config.asm
+++ b/libs/libaom/config/linux/ia32/config/aom_config.asm
diff --git a/media/libaom/config/linux/ia32/config/aom_config.h b/libs/libaom/config/linux/ia32/config/aom_config.h
index d2e651f19..d2e651f19 100644
--- a/media/libaom/config/linux/ia32/config/aom_config.h
+++ b/libs/libaom/config/linux/ia32/config/aom_config.h
diff --git a/media/libaom/config/linux/ia32/config/aom_dsp_rtcd.h b/libs/libaom/config/linux/ia32/config/aom_dsp_rtcd.h
index 9018213bd..9018213bd 100644
--- a/media/libaom/config/linux/ia32/config/aom_dsp_rtcd.h
+++ b/libs/libaom/config/linux/ia32/config/aom_dsp_rtcd.h
diff --git a/media/libaom/config/linux/ia32/config/aom_scale_rtcd.h b/libs/libaom/config/linux/ia32/config/aom_scale_rtcd.h
index 65c184b83..65c184b83 100644
--- a/media/libaom/config/linux/ia32/config/aom_scale_rtcd.h
+++ b/libs/libaom/config/linux/ia32/config/aom_scale_rtcd.h
diff --git a/media/libaom/config/linux/ia32/config/av1_rtcd.h b/libs/libaom/config/linux/ia32/config/av1_rtcd.h
index 7ecd05f38..7ecd05f38 100644
--- a/media/libaom/config/linux/ia32/config/av1_rtcd.h
+++ b/libs/libaom/config/linux/ia32/config/av1_rtcd.h
diff --git a/media/libaom/config/linux/x64/config/aom_config.asm b/libs/libaom/config/linux/x64/config/aom_config.asm
index 9ce9b2090..9ce9b2090 100644
--- a/media/libaom/config/linux/x64/config/aom_config.asm
+++ b/libs/libaom/config/linux/x64/config/aom_config.asm
diff --git a/media/libaom/config/linux/x64/config/aom_config.h b/libs/libaom/config/linux/x64/config/aom_config.h
index 12997ea4d..12997ea4d 100644
--- a/media/libaom/config/linux/x64/config/aom_config.h
+++ b/libs/libaom/config/linux/x64/config/aom_config.h
diff --git a/media/libaom/config/linux/x64/config/aom_dsp_rtcd.h b/libs/libaom/config/linux/x64/config/aom_dsp_rtcd.h
index 36c170a05..36c170a05 100644
--- a/media/libaom/config/linux/x64/config/aom_dsp_rtcd.h
+++ b/libs/libaom/config/linux/x64/config/aom_dsp_rtcd.h
diff --git a/media/libaom/config/linux/x64/config/aom_scale_rtcd.h b/libs/libaom/config/linux/x64/config/aom_scale_rtcd.h
index 65c184b83..65c184b83 100644
--- a/media/libaom/config/linux/x64/config/aom_scale_rtcd.h
+++ b/libs/libaom/config/linux/x64/config/aom_scale_rtcd.h
diff --git a/media/libaom/config/linux/x64/config/av1_rtcd.h b/libs/libaom/config/linux/x64/config/av1_rtcd.h
index 8f20181b4..8f20181b4 100644
--- a/media/libaom/config/linux/x64/config/av1_rtcd.h
+++ b/libs/libaom/config/linux/x64/config/av1_rtcd.h
diff --git a/media/libaom/config/mac/x64/config/aom_config.asm b/libs/libaom/config/mac/x64/config/aom_config.asm
index 9ce9b2090..9ce9b2090 100644
--- a/media/libaom/config/mac/x64/config/aom_config.asm
+++ b/libs/libaom/config/mac/x64/config/aom_config.asm
diff --git a/media/libaom/config/mac/x64/config/aom_config.h b/libs/libaom/config/mac/x64/config/aom_config.h
index 12997ea4d..12997ea4d 100644
--- a/media/libaom/config/mac/x64/config/aom_config.h
+++ b/libs/libaom/config/mac/x64/config/aom_config.h
diff --git a/media/libaom/config/mac/x64/config/aom_dsp_rtcd.h b/libs/libaom/config/mac/x64/config/aom_dsp_rtcd.h
index 36c170a05..36c170a05 100644
--- a/media/libaom/config/mac/x64/config/aom_dsp_rtcd.h
+++ b/libs/libaom/config/mac/x64/config/aom_dsp_rtcd.h
diff --git a/media/libaom/config/mac/x64/config/aom_scale_rtcd.h b/libs/libaom/config/mac/x64/config/aom_scale_rtcd.h
index 65c184b83..65c184b83 100644
--- a/media/libaom/config/mac/x64/config/aom_scale_rtcd.h
+++ b/libs/libaom/config/mac/x64/config/aom_scale_rtcd.h
diff --git a/media/libaom/config/mac/x64/config/av1_rtcd.h b/libs/libaom/config/mac/x64/config/av1_rtcd.h
index 8f20181b4..8f20181b4 100644
--- a/media/libaom/config/mac/x64/config/av1_rtcd.h
+++ b/libs/libaom/config/mac/x64/config/av1_rtcd.h
diff --git a/media/libaom/config/win/ia32/config/aom_config.asm b/libs/libaom/config/win/ia32/config/aom_config.asm
index baf05cb91..baf05cb91 100644
--- a/media/libaom/config/win/ia32/config/aom_config.asm
+++ b/libs/libaom/config/win/ia32/config/aom_config.asm
diff --git a/media/libaom/config/win/ia32/config/aom_config.h b/libs/libaom/config/win/ia32/config/aom_config.h
index fc1271c74..fc1271c74 100644
--- a/media/libaom/config/win/ia32/config/aom_config.h
+++ b/libs/libaom/config/win/ia32/config/aom_config.h
diff --git a/media/libaom/config/win/ia32/config/aom_dsp_rtcd.h b/libs/libaom/config/win/ia32/config/aom_dsp_rtcd.h
index 9018213bd..9018213bd 100644
--- a/media/libaom/config/win/ia32/config/aom_dsp_rtcd.h
+++ b/libs/libaom/config/win/ia32/config/aom_dsp_rtcd.h
diff --git a/media/libaom/config/win/ia32/config/aom_scale_rtcd.h b/libs/libaom/config/win/ia32/config/aom_scale_rtcd.h
index 65c184b83..65c184b83 100644
--- a/media/libaom/config/win/ia32/config/aom_scale_rtcd.h
+++ b/libs/libaom/config/win/ia32/config/aom_scale_rtcd.h
diff --git a/media/libaom/config/win/ia32/config/av1_rtcd.h b/libs/libaom/config/win/ia32/config/av1_rtcd.h
index 7ecd05f38..7ecd05f38 100644
--- a/media/libaom/config/win/ia32/config/av1_rtcd.h
+++ b/libs/libaom/config/win/ia32/config/av1_rtcd.h
diff --git a/media/libaom/config/win/mingw32/config/aom_config.asm b/libs/libaom/config/win/mingw32/config/aom_config.asm
index baf05cb91..baf05cb91 100644
--- a/media/libaom/config/win/mingw32/config/aom_config.asm
+++ b/libs/libaom/config/win/mingw32/config/aom_config.asm
diff --git a/media/libaom/config/win/mingw32/config/aom_config.h b/libs/libaom/config/win/mingw32/config/aom_config.h
index fc1271c74..fc1271c74 100644
--- a/media/libaom/config/win/mingw32/config/aom_config.h
+++ b/libs/libaom/config/win/mingw32/config/aom_config.h
diff --git a/media/libaom/config/win/mingw32/config/aom_dsp_rtcd.h b/libs/libaom/config/win/mingw32/config/aom_dsp_rtcd.h
index 9018213bd..9018213bd 100644
--- a/media/libaom/config/win/mingw32/config/aom_dsp_rtcd.h
+++ b/libs/libaom/config/win/mingw32/config/aom_dsp_rtcd.h
diff --git a/media/libaom/config/win/mingw32/config/aom_scale_rtcd.h b/libs/libaom/config/win/mingw32/config/aom_scale_rtcd.h
index 65c184b83..65c184b83 100644
--- a/media/libaom/config/win/mingw32/config/aom_scale_rtcd.h
+++ b/libs/libaom/config/win/mingw32/config/aom_scale_rtcd.h
diff --git a/media/libaom/config/win/mingw32/config/av1_rtcd.h b/libs/libaom/config/win/mingw32/config/av1_rtcd.h
index 7ecd05f38..7ecd05f38 100644
--- a/media/libaom/config/win/mingw32/config/av1_rtcd.h
+++ b/libs/libaom/config/win/mingw32/config/av1_rtcd.h
diff --git a/media/libaom/config/win/mingw64/config/aom_config.asm b/libs/libaom/config/win/mingw64/config/aom_config.asm
index 9ce9b2090..9ce9b2090 100644
--- a/media/libaom/config/win/mingw64/config/aom_config.asm
+++ b/libs/libaom/config/win/mingw64/config/aom_config.asm
diff --git a/media/libaom/config/win/mingw64/config/aom_config.h b/libs/libaom/config/win/mingw64/config/aom_config.h
index 12997ea4d..12997ea4d 100644
--- a/media/libaom/config/win/mingw64/config/aom_config.h
+++ b/libs/libaom/config/win/mingw64/config/aom_config.h
diff --git a/media/libaom/config/win/mingw64/config/aom_dsp_rtcd.h b/libs/libaom/config/win/mingw64/config/aom_dsp_rtcd.h
index 36c170a05..36c170a05 100644
--- a/media/libaom/config/win/mingw64/config/aom_dsp_rtcd.h
+++ b/libs/libaom/config/win/mingw64/config/aom_dsp_rtcd.h
diff --git a/media/libaom/config/win/mingw64/config/aom_scale_rtcd.h b/libs/libaom/config/win/mingw64/config/aom_scale_rtcd.h
index 65c184b83..65c184b83 100644
--- a/media/libaom/config/win/mingw64/config/aom_scale_rtcd.h
+++ b/libs/libaom/config/win/mingw64/config/aom_scale_rtcd.h
diff --git a/media/libaom/config/win/mingw64/config/av1_rtcd.h b/libs/libaom/config/win/mingw64/config/av1_rtcd.h
index 8f20181b4..8f20181b4 100644
--- a/media/libaom/config/win/mingw64/config/av1_rtcd.h
+++ b/libs/libaom/config/win/mingw64/config/av1_rtcd.h
diff --git a/media/libaom/config/win/x64/config/aom_config.asm b/libs/libaom/config/win/x64/config/aom_config.asm
index 9ce9b2090..9ce9b2090 100644
--- a/media/libaom/config/win/x64/config/aom_config.asm
+++ b/libs/libaom/config/win/x64/config/aom_config.asm
diff --git a/media/libaom/config/win/x64/config/aom_config.h b/libs/libaom/config/win/x64/config/aom_config.h
index 12997ea4d..12997ea4d 100644
--- a/media/libaom/config/win/x64/config/aom_config.h
+++ b/libs/libaom/config/win/x64/config/aom_config.h
diff --git a/media/libaom/config/win/x64/config/aom_dsp_rtcd.h b/libs/libaom/config/win/x64/config/aom_dsp_rtcd.h
index 36c170a05..36c170a05 100644
--- a/media/libaom/config/win/x64/config/aom_dsp_rtcd.h
+++ b/libs/libaom/config/win/x64/config/aom_dsp_rtcd.h
diff --git a/media/libaom/config/win/x64/config/aom_scale_rtcd.h b/libs/libaom/config/win/x64/config/aom_scale_rtcd.h
index 65c184b83..65c184b83 100644
--- a/media/libaom/config/win/x64/config/aom_scale_rtcd.h
+++ b/libs/libaom/config/win/x64/config/aom_scale_rtcd.h
diff --git a/media/libaom/config/win/x64/config/av1_rtcd.h b/libs/libaom/config/win/x64/config/av1_rtcd.h
index 8f20181b4..8f20181b4 100644
--- a/media/libaom/config/win/x64/config/av1_rtcd.h
+++ b/libs/libaom/config/win/x64/config/av1_rtcd.h
diff --git a/media/libaom/generate_sources_mozbuild.py b/libs/libaom/generate_sources_mozbuild.py
index 2f89c9948..32547bff9 100644
--- a/media/libaom/generate_sources_mozbuild.py
+++ b/libs/libaom/generate_sources_mozbuild.py
@@ -9,7 +9,7 @@ import os
 import re
 import subprocess
 
-AOM_DIR = '/media/libaom/src'
+AOM_DIR = '/libs/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/libs/libaom/generate_sources_mozbuild.sh
index d712d145d..d733ef230 100755
--- a/media/libaom/generate_sources_mozbuild.sh
+++ b/libs/libaom/generate_sources_mozbuild.sh
@@ -15,7 +15,7 @@
 
 export LC_ALL=C
 BASE_DIR=$(pwd)
-LIBAOM_SRC_DIR="/media/libaom/src"
+LIBAOM_SRC_DIR="/libs/libaom/src"
 LIBAOM_CONFIG_DIR="config"
 
 # Print license header.
diff --git a/media/libaom/moz.build b/libs/libaom/moz.build
index aedac3102..9e730913e 100644
--- a/media/libaom/moz.build
+++ b/libs/libaom/moz.build
@@ -15,21 +15,17 @@ if CONFIG['CPU_ARCH'] == 'x86_64':
     USE_YASM = True
     if CONFIG['OS_TARGET'] == 'WINNT':
         if CONFIG['GNU_CC']:
-            ASFLAGS += [ '-I%s/media/libaom/config/win/mingw64/' % TOPSRCDIR ]
-            LOCAL_INCLUDES += [ '/media/libaom/config/win/mingw64/' ]
+            ASFLAGS += [ '-I%s/libs/libaom/config/win/mingw64/' % TOPSRCDIR ]
+            LOCAL_INCLUDES += [ '/libs/libaom/config/win/mingw64/' ]
             EXPORTS.aom += [ 'config/win/mingw64/config/aom_config.h' ]
         else:
-            ASFLAGS += [ '-I%s/media/libaom/config/win/x64/' % TOPSRCDIR ]
-            LOCAL_INCLUDES += [ '/media/libaom/config/win/x64/' ]
+            ASFLAGS += [ '-I%s/libs/libaom/config/win/x64/' % TOPSRCDIR ]
+            LOCAL_INCLUDES += [ '/libs/libaom/config/win/x64/' ]
             EXPORTS.aom += [ 'config/win/x64/config/aom_config.h' ]
             NO_PGO = True
-    elif CONFIG['OS_TARGET'] == 'Darwin':
-        ASFLAGS += [ '-I%s/media/libaom/config/mac/x64/' % TOPSRCDIR ]
-        LOCAL_INCLUDES += [ '/media/libaom/config/mac/x64/' ]
-        EXPORTS.aom += [ 'config/mac/x64/config/aom_config.h' ]
-    else: # Android, Linux, BSDs, etc.
-        ASFLAGS += [ '-I%s/media/libaom/config/linux/x64/' % TOPSRCDIR ]
-        LOCAL_INCLUDES += [ '/media/libaom/config/linux/x64/' ]
+    else: # Android, Linux, SunOS, etc.
+        ASFLAGS += [ '-I%s/libs/libaom/config/linux/x64/' % TOPSRCDIR ]
+        LOCAL_INCLUDES += [ '/libs/libaom/config/linux/x64/' ]
         EXPORTS.aom += [ 'config/linux/x64/config/aom_config.h' ]
 elif CONFIG['CPU_ARCH'] == 'x86':
     EXPORTS.aom += files['IA32_EXPORTS']
@@ -37,25 +33,25 @@ elif CONFIG['CPU_ARCH'] == 'x86':
     USE_YASM = True
     if CONFIG['OS_TARGET'] == 'WINNT':
         if CONFIG['GNU_CC']:
-            ASFLAGS += [ '-I%s/media/libaom/config/win/mingw32/' % TOPSRCDIR ]
-            LOCAL_INCLUDES += [ '/media/libaom/config/win/mingw32/' ]
+            ASFLAGS += [ '-I%s/libs/libaom/config/win/mingw32/' % TOPSRCDIR ]
+            LOCAL_INCLUDES += [ '/libs/libaom/config/win/mingw32/' ]
             EXPORTS.aom += [ 'config/win/mingw32/config/aom_config.h' ]
         else:
-            ASFLAGS += [ '-I%s/media/libaom/config/win/ia32/' % TOPSRCDIR ]
-            LOCAL_INCLUDES += [ '/media/libaom/config/win/ia32/' ]
+            ASFLAGS += [ '-I%s/libs/libaom/config/win/ia32/' % TOPSRCDIR ]
+            LOCAL_INCLUDES += [ '/libs/libaom/config/win/ia32/' ]
             EXPORTS.aom += [ 'config/win/ia32/config/aom_config.h' ]
             NO_PGO = True
-    else: # Android, Linux, BSDs, etc.
-        ASFLAGS += [ '-I%s/media/libaom/config/linux/ia32/' % TOPSRCDIR ]
-        LOCAL_INCLUDES += [ '/media/libaom/config/linux/ia32/' ]
+    else: # Android, Linux, SunOS, etc.
+        ASFLAGS += [ '-I%s/libs/libaom/config/linux/ia32/' % TOPSRCDIR ]
+        LOCAL_INCLUDES += [ '/libs/libaom/config/linux/ia32/' ]
         EXPORTS.aom += [ 'config/linux/ia32/config/aom_config.h' ]
 elif CONFIG['CPU_ARCH'] == 'arm':
     EXPORTS.aom += files['ARM_EXPORTS']
     ASFLAGS += [
-        '-I%s/media/libaom/config/linux/arm/' % TOPSRCDIR,
+        '-I%s/libs/libaom/config/linux/arm/' % TOPSRCDIR,
         '-I%s/libaom' % OBJDIR,
     ]
-    LOCAL_INCLUDES += [ '/media/libaom/config/linux/arm/' ]
+    LOCAL_INCLUDES += [ '/libs/libaom/config/linux/arm/' ]
     EXPORTS.aom += [ 'config/linux/arm/config/aom_config.h' ]
 
     arm_asm_files = files['ARM_SOURCES']
@@ -84,8 +80,8 @@ else:
     # Generic C-only configuration
     EXPORTS.aom += files['GENERIC_EXPORTS']
     SOURCES += files['GENERIC_SOURCES']
-    ASFLAGS += [ '-I%s/media/libaom/config/generic/' % TOPSRCDIR ]
-    LOCAL_INCLUDES += [ '/media/libaom/config/generic/' ]
+    ASFLAGS += [ '-I%s/libs/libaom/config/generic/' % TOPSRCDIR ]
+    LOCAL_INCLUDES += [ '/libs/libaom/config/generic/' ]
     EXPORTS.aom += [ 'config/generic/config/aom_config.h' ]
 
 if CONFIG['GKMEDIAS_SHARED_LIBRARY']:
@@ -136,10 +132,10 @@ if CONFIG['CLANG_CXX'] or CONFIG['CLANG_CL']:
 ASFLAGS += CONFIG['VPX_ASFLAGS']
 ASFLAGS += [
     '-I.',
-    '-I%s/media/libaom/src' % TOPSRCDIR,
+    '-I%s/libs/libaom/src' % TOPSRCDIR,
 ]
 
 LOCAL_INCLUDES += [
-    '/media/libaom/config', # aom_version.h
-    '/media/libaom/src',
+    '/libs/libaom/config', # aom_version.h
+    '/libs/libaom/src',
 ]
diff --git a/libs/libaom/sources.mozbuild b/libs/libaom/sources.mozbuild
new file mode 100644
index 000000000..887d2531a
--- /dev/null
+++ b/libs/libaom/sources.mozbuild
@@ -0,0 +1,544 @@
+# This file is generated. Do not edit.
+
+files = {
+  'ARM_EXPORTS': [
+    '/libs/libaom/src/aom/aom.h',
+    '/libs/libaom/src/aom/aom_codec.h',
+    '/libs/libaom/src/aom/aom_decoder.h',
+    '/libs/libaom/src/aom/aom_encoder.h',
+    '/libs/libaom/src/aom/aom_frame_buffer.h',
+    '/libs/libaom/src/aom/aom_image.h',
+    '/libs/libaom/src/aom/aom_integer.h',
+    '/libs/libaom/src/aom/aomcx.h',
+    '/libs/libaom/src/aom/aomdx.h',
+    '/libs/libaom/src/aom_mem/aom_mem.h',
+    '/libs/libaom/src/aom_ports/aom_timer.h',
+    '/libs/libaom/src/aom_ports/arm.h',
+    '/libs/libaom/src/aom_ports/bitops.h',
+    '/libs/libaom/src/aom_ports/mem.h',
+    '/libs/libaom/src/aom_ports/sanitizer.h',
+    '/libs/libaom/src/aom_ports/system_state.h',
+    '/libs/libaom/src/aom_scale/aom_scale.h',
+    '/libs/libaom/src/aom_scale/yv12config.h',
+  ],
+  'ARM_SOURCES': [
+    '/libs/libaom/src/aom/src/aom_codec.c',
+    '/libs/libaom/src/aom/src/aom_decoder.c',
+    '/libs/libaom/src/aom/src/aom_encoder.c',
+    '/libs/libaom/src/aom/src/aom_image.c',
+    '/libs/libaom/src/aom/src/aom_integer.c',
+    '/libs/libaom/src/aom_dsp/aom_convolve.c',
+    '/libs/libaom/src/aom_dsp/aom_dsp_rtcd.c',
+    '/libs/libaom/src/aom_dsp/arm/blend_a64_mask_neon.c',
+    '/libs/libaom/src/aom_dsp/arm/fwd_txfm_neon.c',
+    '/libs/libaom/src/aom_dsp/arm/intrapred_neon.c',
+    '/libs/libaom/src/aom_dsp/arm/loopfilter_neon.c',
+    '/libs/libaom/src/aom_dsp/arm/subtract_neon.c',
+    '/libs/libaom/src/aom_dsp/avg.c',
+    '/libs/libaom/src/aom_dsp/binary_codes_reader.c',
+    '/libs/libaom/src/aom_dsp/bitreader.c',
+    '/libs/libaom/src/aom_dsp/bitreader_buffer.c',
+    '/libs/libaom/src/aom_dsp/bitwriter_buffer.c',
+    '/libs/libaom/src/aom_dsp/blend_a64_hmask.c',
+    '/libs/libaom/src/aom_dsp/blend_a64_mask.c',
+    '/libs/libaom/src/aom_dsp/blend_a64_vmask.c',
+    '/libs/libaom/src/aom_dsp/entcode.c',
+    '/libs/libaom/src/aom_dsp/entdec.c',
+    '/libs/libaom/src/aom_dsp/fft.c',
+    '/libs/libaom/src/aom_dsp/grain_synthesis.c',
+    '/libs/libaom/src/aom_dsp/intrapred.c',
+    '/libs/libaom/src/aom_dsp/loopfilter.c',
+    '/libs/libaom/src/aom_dsp/subtract.c',
+    '/libs/libaom/src/aom_mem/aom_mem.c',
+    '/libs/libaom/src/aom_ports/arm_cpudetect.c',
+    '/libs/libaom/src/aom_scale/aom_scale_rtcd.c',
+    '/libs/libaom/src/aom_scale/generic/aom_scale.c',
+    '/libs/libaom/src/aom_scale/generic/gen_scalers.c',
+    '/libs/libaom/src/aom_scale/generic/yv12config.c',
+    '/libs/libaom/src/aom_scale/generic/yv12extend.c',
+    '/libs/libaom/src/aom_util/aom_thread.c',
+    '/libs/libaom/src/aom_util/debug_util.c',
+    '/libs/libaom/src/av1/av1_dx_iface.c',
+    '/libs/libaom/src/av1/common/alloccommon.c',
+    '/libs/libaom/src/av1/common/arm/av1_inv_txfm_neon.c',
+    '/libs/libaom/src/av1/common/arm/av1_txfm_neon.c',
+    '/libs/libaom/src/av1/common/arm/blend_a64_hmask_neon.c',
+    '/libs/libaom/src/av1/common/arm/blend_a64_vmask_neon.c',
+    '/libs/libaom/src/av1/common/arm/cfl_neon.c',
+    '/libs/libaom/src/av1/common/arm/convolve_neon.c',
+    '/libs/libaom/src/av1/common/arm/jnt_convolve_neon.c',
+    '/libs/libaom/src/av1/common/arm/reconinter_neon.c',
+    '/libs/libaom/src/av1/common/arm/selfguided_neon.c',
+    '/libs/libaom/src/av1/common/arm/warp_plane_neon.c',
+    '/libs/libaom/src/av1/common/arm/wiener_convolve_neon.c',
+    '/libs/libaom/src/av1/common/av1_inv_txfm1d.c',
+    '/libs/libaom/src/av1/common/av1_inv_txfm2d.c',
+    '/libs/libaom/src/av1/common/av1_loopfilter.c',
+    '/libs/libaom/src/av1/common/av1_rtcd.c',
+    '/libs/libaom/src/av1/common/av1_txfm.c',
+    '/libs/libaom/src/av1/common/blockd.c',
+    '/libs/libaom/src/av1/common/cdef.c',
+    '/libs/libaom/src/av1/common/cdef_block.c',
+    '/libs/libaom/src/av1/common/cdef_block_neon.c',
+    '/libs/libaom/src/av1/common/cfl.c',
+    '/libs/libaom/src/av1/common/convolve.c',
+    '/libs/libaom/src/av1/common/debugmodes.c',
+    '/libs/libaom/src/av1/common/entropy.c',
+    '/libs/libaom/src/av1/common/entropymode.c',
+    '/libs/libaom/src/av1/common/entropymv.c',
+    '/libs/libaom/src/av1/common/frame_buffers.c',
+    '/libs/libaom/src/av1/common/idct.c',
+    '/libs/libaom/src/av1/common/mvref_common.c',
+    '/libs/libaom/src/av1/common/obu_util.c',
+    '/libs/libaom/src/av1/common/odintrin.c',
+    '/libs/libaom/src/av1/common/pred_common.c',
+    '/libs/libaom/src/av1/common/quant_common.c',
+    '/libs/libaom/src/av1/common/reconinter.c',
+    '/libs/libaom/src/av1/common/reconintra.c',
+    '/libs/libaom/src/av1/common/resize.c',
+    '/libs/libaom/src/av1/common/restoration.c',
+    '/libs/libaom/src/av1/common/scale.c',
+    '/libs/libaom/src/av1/common/scan.c',
+    '/libs/libaom/src/av1/common/seg_common.c',
+    '/libs/libaom/src/av1/common/thread_common.c',
+    '/libs/libaom/src/av1/common/tile_common.c',
+    '/libs/libaom/src/av1/common/timing.c',
+    '/libs/libaom/src/av1/common/txb_common.c',
+    '/libs/libaom/src/av1/common/warped_motion.c',
+    '/libs/libaom/src/av1/decoder/decodeframe.c',
+    '/libs/libaom/src/av1/decoder/decodemv.c',
+    '/libs/libaom/src/av1/decoder/decoder.c',
+    '/libs/libaom/src/av1/decoder/decodetxb.c',
+    '/libs/libaom/src/av1/decoder/detokenize.c',
+    '/libs/libaom/src/av1/decoder/obu.c',
+    '/libs/libaom/src/av1/encoder/arm/neon/av1_error_neon.c',
+    '/libs/libaom/src/av1/encoder/arm/neon/quantize_neon.c',
+  ],
+  'GENERIC_EXPORTS': [
+    '/libs/libaom/src/aom/aom.h',
+    '/libs/libaom/src/aom/aom_codec.h',
+    '/libs/libaom/src/aom/aom_decoder.h',
+    '/libs/libaom/src/aom/aom_encoder.h',
+    '/libs/libaom/src/aom/aom_frame_buffer.h',
+    '/libs/libaom/src/aom/aom_image.h',
+    '/libs/libaom/src/aom/aom_integer.h',
+    '/libs/libaom/src/aom/aomcx.h',
+    '/libs/libaom/src/aom/aomdx.h',
+    '/libs/libaom/src/aom_mem/aom_mem.h',
+    '/libs/libaom/src/aom_ports/aom_timer.h',
+    '/libs/libaom/src/aom_ports/bitops.h',
+    '/libs/libaom/src/aom_ports/mem.h',
+    '/libs/libaom/src/aom_ports/sanitizer.h',
+    '/libs/libaom/src/aom_ports/system_state.h',
+    '/libs/libaom/src/aom_scale/aom_scale.h',
+    '/libs/libaom/src/aom_scale/yv12config.h',
+  ],
+  'GENERIC_SOURCES': [
+    '/libs/libaom/src/aom/src/aom_codec.c',
+    '/libs/libaom/src/aom/src/aom_decoder.c',
+    '/libs/libaom/src/aom/src/aom_encoder.c',
+    '/libs/libaom/src/aom/src/aom_image.c',
+    '/libs/libaom/src/aom/src/aom_integer.c',
+    '/libs/libaom/src/aom_dsp/aom_convolve.c',
+    '/libs/libaom/src/aom_dsp/aom_dsp_rtcd.c',
+    '/libs/libaom/src/aom_dsp/avg.c',
+    '/libs/libaom/src/aom_dsp/binary_codes_reader.c',
+    '/libs/libaom/src/aom_dsp/bitreader.c',
+    '/libs/libaom/src/aom_dsp/bitreader_buffer.c',
+    '/libs/libaom/src/aom_dsp/bitwriter_buffer.c',
+    '/libs/libaom/src/aom_dsp/blend_a64_hmask.c',
+    '/libs/libaom/src/aom_dsp/blend_a64_mask.c',
+    '/libs/libaom/src/aom_dsp/blend_a64_vmask.c',
+    '/libs/libaom/src/aom_dsp/entcode.c',
+    '/libs/libaom/src/aom_dsp/entdec.c',
+    '/libs/libaom/src/aom_dsp/fft.c',
+    '/libs/libaom/src/aom_dsp/grain_synthesis.c',
+    '/libs/libaom/src/aom_dsp/intrapred.c',
+    '/libs/libaom/src/aom_dsp/loopfilter.c',
+    '/libs/libaom/src/aom_dsp/subtract.c',
+    '/libs/libaom/src/aom_mem/aom_mem.c',
+    '/libs/libaom/src/aom_scale/aom_scale_rtcd.c',
+    '/libs/libaom/src/aom_scale/generic/aom_scale.c',
+    '/libs/libaom/src/aom_scale/generic/gen_scalers.c',
+    '/libs/libaom/src/aom_scale/generic/yv12config.c',
+    '/libs/libaom/src/aom_scale/generic/yv12extend.c',
+    '/libs/libaom/src/aom_util/aom_thread.c',
+    '/libs/libaom/src/aom_util/debug_util.c',
+    '/libs/libaom/src/av1/av1_dx_iface.c',
+    '/libs/libaom/src/av1/common/alloccommon.c',
+    '/libs/libaom/src/av1/common/av1_inv_txfm1d.c',
+    '/libs/libaom/src/av1/common/av1_inv_txfm2d.c',
+    '/libs/libaom/src/av1/common/av1_loopfilter.c',
+    '/libs/libaom/src/av1/common/av1_rtcd.c',
+    '/libs/libaom/src/av1/common/av1_txfm.c',
+    '/libs/libaom/src/av1/common/blockd.c',
+    '/libs/libaom/src/av1/common/cdef.c',
+    '/libs/libaom/src/av1/common/cdef_block.c',
+    '/libs/libaom/src/av1/common/cfl.c',
+    '/libs/libaom/src/av1/common/convolve.c',
+    '/libs/libaom/src/av1/common/debugmodes.c',
+    '/libs/libaom/src/av1/common/entropy.c',
+    '/libs/libaom/src/av1/common/entropymode.c',
+    '/libs/libaom/src/av1/common/entropymv.c',
+    '/libs/libaom/src/av1/common/frame_buffers.c',
+    '/libs/libaom/src/av1/common/idct.c',
+    '/libs/libaom/src/av1/common/mvref_common.c',
+    '/libs/libaom/src/av1/common/obu_util.c',
+    '/libs/libaom/src/av1/common/odintrin.c',
+    '/libs/libaom/src/av1/common/pred_common.c',
+    '/libs/libaom/src/av1/common/quant_common.c',
+    '/libs/libaom/src/av1/common/reconinter.c',
+    '/libs/libaom/src/av1/common/reconintra.c',
+    '/libs/libaom/src/av1/common/resize.c',
+    '/libs/libaom/src/av1/common/restoration.c',
+    '/libs/libaom/src/av1/common/scale.c',
+    '/libs/libaom/src/av1/common/scan.c',
+    '/libs/libaom/src/av1/common/seg_common.c',
+    '/libs/libaom/src/av1/common/thread_common.c',
+    '/libs/libaom/src/av1/common/tile_common.c',
+    '/libs/libaom/src/av1/common/timing.c',
+    '/libs/libaom/src/av1/common/txb_common.c',
+    '/libs/libaom/src/av1/common/warped_motion.c',
+    '/libs/libaom/src/av1/decoder/decodeframe.c',
+    '/libs/libaom/src/av1/decoder/decodemv.c',
+    '/libs/libaom/src/av1/decoder/decoder.c',
+    '/libs/libaom/src/av1/decoder/decodetxb.c',
+    '/libs/libaom/src/av1/decoder/detokenize.c',
+    '/libs/libaom/src/av1/decoder/obu.c',
+  ],
+  'IA32_EXPORTS': [
+    '/libs/libaom/src/aom/aom.h',
+    '/libs/libaom/src/aom/aom_codec.h',
+    '/libs/libaom/src/aom/aom_decoder.h',
+    '/libs/libaom/src/aom/aom_encoder.h',
+    '/libs/libaom/src/aom/aom_frame_buffer.h',
+    '/libs/libaom/src/aom/aom_image.h',
+    '/libs/libaom/src/aom/aom_integer.h',
+    '/libs/libaom/src/aom/aomcx.h',
+    '/libs/libaom/src/aom/aomdx.h',
+    '/libs/libaom/src/aom_mem/aom_mem.h',
+    '/libs/libaom/src/aom_ports/aom_timer.h',
+    '/libs/libaom/src/aom_ports/bitops.h',
+    '/libs/libaom/src/aom_ports/mem.h',
+    '/libs/libaom/src/aom_ports/sanitizer.h',
+    '/libs/libaom/src/aom_ports/system_state.h',
+    '/libs/libaom/src/aom_scale/aom_scale.h',
+    '/libs/libaom/src/aom_scale/yv12config.h',
+  ],
+  'IA32_SOURCES': [
+    '/libs/libaom/src/aom/src/aom_codec.c',
+    '/libs/libaom/src/aom/src/aom_decoder.c',
+    '/libs/libaom/src/aom/src/aom_encoder.c',
+    '/libs/libaom/src/aom/src/aom_image.c',
+    '/libs/libaom/src/aom/src/aom_integer.c',
+    '/libs/libaom/src/aom_dsp/aom_convolve.c',
+    '/libs/libaom/src/aom_dsp/aom_dsp_rtcd.c',
+    '/libs/libaom/src/aom_dsp/avg.c',
+    '/libs/libaom/src/aom_dsp/binary_codes_reader.c',
+    '/libs/libaom/src/aom_dsp/bitreader.c',
+    '/libs/libaom/src/aom_dsp/bitreader_buffer.c',
+    '/libs/libaom/src/aom_dsp/bitwriter_buffer.c',
+    '/libs/libaom/src/aom_dsp/blend_a64_hmask.c',
+    '/libs/libaom/src/aom_dsp/blend_a64_mask.c',
+    '/libs/libaom/src/aom_dsp/blend_a64_vmask.c',
+    '/libs/libaom/src/aom_dsp/entcode.c',
+    '/libs/libaom/src/aom_dsp/entdec.c',
+    '/libs/libaom/src/aom_dsp/fft.c',
+    '/libs/libaom/src/aom_dsp/grain_synthesis.c',
+    '/libs/libaom/src/aom_dsp/intrapred.c',
+    '/libs/libaom/src/aom_dsp/loopfilter.c',
+    '/libs/libaom/src/aom_dsp/subtract.c',
+    '/libs/libaom/src/aom_dsp/x86/aom_asm_stubs.c',
+    '/libs/libaom/src/aom_dsp/x86/aom_convolve_copy_sse2.asm',
+    '/libs/libaom/src/aom_dsp/x86/aom_high_subpixel_8t_sse2.asm',
+    '/libs/libaom/src/aom_dsp/x86/aom_high_subpixel_bilinear_sse2.asm',
+    '/libs/libaom/src/aom_dsp/x86/aom_subpixel_8t_intrin_avx2.c',
+    '/libs/libaom/src/aom_dsp/x86/aom_subpixel_8t_intrin_sse2.c',
+    '/libs/libaom/src/aom_dsp/x86/aom_subpixel_8t_intrin_ssse3.c',
+    '/libs/libaom/src/aom_dsp/x86/aom_subpixel_8t_sse2.asm',
+    '/libs/libaom/src/aom_dsp/x86/aom_subpixel_8t_ssse3.asm',
+    '/libs/libaom/src/aom_dsp/x86/aom_subpixel_bilinear_sse2.asm',
+    '/libs/libaom/src/aom_dsp/x86/aom_subpixel_bilinear_ssse3.asm',
+    '/libs/libaom/src/aom_dsp/x86/avg_intrin_avx2.c',
+    '/libs/libaom/src/aom_dsp/x86/avg_intrin_sse2.c',
+    '/libs/libaom/src/aom_dsp/x86/blend_a64_hmask_sse4.c',
+    '/libs/libaom/src/aom_dsp/x86/blend_a64_mask_avx2.c',
+    '/libs/libaom/src/aom_dsp/x86/blend_a64_mask_sse4.c',
+    '/libs/libaom/src/aom_dsp/x86/blend_a64_vmask_sse4.c',
+    '/libs/libaom/src/aom_dsp/x86/fft_avx2.c',
+    '/libs/libaom/src/aom_dsp/x86/fft_sse2.c',
+    '/libs/libaom/src/aom_dsp/x86/highbd_convolve_avx2.c',
+    '/libs/libaom/src/aom_dsp/x86/highbd_convolve_sse2.c',
+    '/libs/libaom/src/aom_dsp/x86/highbd_convolve_ssse3.c',
+    '/libs/libaom/src/aom_dsp/x86/highbd_intrapred_asm_sse2.asm',
+    '/libs/libaom/src/aom_dsp/x86/highbd_intrapred_sse2.c',
+    '/libs/libaom/src/aom_dsp/x86/highbd_loopfilter_avx2.c',
+    '/libs/libaom/src/aom_dsp/x86/highbd_loopfilter_sse2.c',
+    '/libs/libaom/src/aom_dsp/x86/intrapred_asm_sse2.asm',
+    '/libs/libaom/src/aom_dsp/x86/intrapred_avx2.c',
+    '/libs/libaom/src/aom_dsp/x86/intrapred_sse2.c',
+    '/libs/libaom/src/aom_dsp/x86/intrapred_ssse3.c',
+    '/libs/libaom/src/aom_dsp/x86/inv_wht_sse2.asm',
+    '/libs/libaom/src/aom_dsp/x86/loopfilter_sse2.c',
+    '/libs/libaom/src/aom_mem/aom_mem.c',
+    '/libs/libaom/src/aom_ports/emms.asm',
+    '/libs/libaom/src/aom_ports/x86_abi_support.asm',
+    '/libs/libaom/src/aom_scale/aom_scale_rtcd.c',
+    '/libs/libaom/src/aom_scale/generic/aom_scale.c',
+    '/libs/libaom/src/aom_scale/generic/gen_scalers.c',
+    '/libs/libaom/src/aom_scale/generic/yv12config.c',
+    '/libs/libaom/src/aom_scale/generic/yv12extend.c',
+    '/libs/libaom/src/aom_util/aom_thread.c',
+    '/libs/libaom/src/aom_util/debug_util.c',
+    '/libs/libaom/src/av1/av1_dx_iface.c',
+    '/libs/libaom/src/av1/common/alloccommon.c',
+    '/libs/libaom/src/av1/common/av1_inv_txfm1d.c',
+    '/libs/libaom/src/av1/common/av1_inv_txfm2d.c',
+    '/libs/libaom/src/av1/common/av1_loopfilter.c',
+    '/libs/libaom/src/av1/common/av1_rtcd.c',
+    '/libs/libaom/src/av1/common/av1_txfm.c',
+    '/libs/libaom/src/av1/common/blockd.c',
+    '/libs/libaom/src/av1/common/cdef.c',
+    '/libs/libaom/src/av1/common/cdef_block.c',
+    '/libs/libaom/src/av1/common/cdef_block_avx2.c',
+    '/libs/libaom/src/av1/common/cdef_block_sse2.c',
+    '/libs/libaom/src/av1/common/cdef_block_sse4.c',
+    '/libs/libaom/src/av1/common/cdef_block_ssse3.c',
+    '/libs/libaom/src/av1/common/cfl.c',
+    '/libs/libaom/src/av1/common/convolve.c',
+    '/libs/libaom/src/av1/common/debugmodes.c',
+    '/libs/libaom/src/av1/common/entropy.c',
+    '/libs/libaom/src/av1/common/entropymode.c',
+    '/libs/libaom/src/av1/common/entropymv.c',
+    '/libs/libaom/src/av1/common/frame_buffers.c',
+    '/libs/libaom/src/av1/common/idct.c',
+    '/libs/libaom/src/av1/common/mvref_common.c',
+    '/libs/libaom/src/av1/common/obu_util.c',
+    '/libs/libaom/src/av1/common/odintrin.c',
+    '/libs/libaom/src/av1/common/pred_common.c',
+    '/libs/libaom/src/av1/common/quant_common.c',
+    '/libs/libaom/src/av1/common/reconinter.c',
+    '/libs/libaom/src/av1/common/reconintra.c',
+    '/libs/libaom/src/av1/common/resize.c',
+    '/libs/libaom/src/av1/common/restoration.c',
+    '/libs/libaom/src/av1/common/scale.c',
+    '/libs/libaom/src/av1/common/scan.c',
+    '/libs/libaom/src/av1/common/seg_common.c',
+    '/libs/libaom/src/av1/common/thread_common.c',
+    '/libs/libaom/src/av1/common/tile_common.c',
+    '/libs/libaom/src/av1/common/timing.c',
+    '/libs/libaom/src/av1/common/txb_common.c',
+    '/libs/libaom/src/av1/common/warped_motion.c',
+    '/libs/libaom/src/av1/common/x86/av1_convolve_horiz_rs_sse4.c',
+    '/libs/libaom/src/av1/common/x86/av1_convolve_scale_sse4.c',
+    '/libs/libaom/src/av1/common/x86/av1_inv_txfm_avx2.c',
+    '/libs/libaom/src/av1/common/x86/av1_inv_txfm_ssse3.c',
+    '/libs/libaom/src/av1/common/x86/av1_txfm_sse4.c',
+    '/libs/libaom/src/av1/common/x86/cfl_avx2.c',
+    '/libs/libaom/src/av1/common/x86/cfl_sse2.c',
+    '/libs/libaom/src/av1/common/x86/cfl_ssse3.c',
+    '/libs/libaom/src/av1/common/x86/convolve_2d_avx2.c',
+    '/libs/libaom/src/av1/common/x86/convolve_2d_sse2.c',
+    '/libs/libaom/src/av1/common/x86/convolve_avx2.c',
+    '/libs/libaom/src/av1/common/x86/convolve_sse2.c',
+    '/libs/libaom/src/av1/common/x86/filterintra_sse4.c',
+    '/libs/libaom/src/av1/common/x86/highbd_convolve_2d_avx2.c',
+    '/libs/libaom/src/av1/common/x86/highbd_convolve_2d_sse2.c',
+    '/libs/libaom/src/av1/common/x86/highbd_convolve_2d_sse4.c',
+    '/libs/libaom/src/av1/common/x86/highbd_convolve_2d_ssse3.c',
+    '/libs/libaom/src/av1/common/x86/highbd_inv_txfm_avx2.c',
+    '/libs/libaom/src/av1/common/x86/highbd_inv_txfm_sse4.c',
+    '/libs/libaom/src/av1/common/x86/highbd_jnt_convolve_avx2.c',
+    '/libs/libaom/src/av1/common/x86/highbd_jnt_convolve_sse4.c',
+    '/libs/libaom/src/av1/common/x86/highbd_warp_plane_sse4.c',
+    '/libs/libaom/src/av1/common/x86/highbd_wiener_convolve_avx2.c',
+    '/libs/libaom/src/av1/common/x86/highbd_wiener_convolve_ssse3.c',
+    '/libs/libaom/src/av1/common/x86/intra_edge_sse4.c',
+    '/libs/libaom/src/av1/common/x86/jnt_convolve_avx2.c',
+    '/libs/libaom/src/av1/common/x86/jnt_convolve_sse2.c',
+    '/libs/libaom/src/av1/common/x86/jnt_convolve_ssse3.c',
+    '/libs/libaom/src/av1/common/x86/reconinter_avx2.c',
+    '/libs/libaom/src/av1/common/x86/reconinter_sse4.c',
+    '/libs/libaom/src/av1/common/x86/reconinter_ssse3.c',
+    '/libs/libaom/src/av1/common/x86/selfguided_avx2.c',
+    '/libs/libaom/src/av1/common/x86/selfguided_sse4.c',
+    '/libs/libaom/src/av1/common/x86/warp_plane_avx2.c',
+    '/libs/libaom/src/av1/common/x86/warp_plane_sse2.c',
+    '/libs/libaom/src/av1/common/x86/warp_plane_sse4.c',
+    '/libs/libaom/src/av1/common/x86/wiener_convolve_avx2.c',
+    '/libs/libaom/src/av1/common/x86/wiener_convolve_sse2.c',
+    '/libs/libaom/src/av1/decoder/decodeframe.c',
+    '/libs/libaom/src/av1/decoder/decodemv.c',
+    '/libs/libaom/src/av1/decoder/decoder.c',
+    '/libs/libaom/src/av1/decoder/decodetxb.c',
+    '/libs/libaom/src/av1/decoder/detokenize.c',
+    '/libs/libaom/src/av1/decoder/obu.c',
+  ],
+  'X64_EXPORTS': [
+    '/libs/libaom/src/aom/aom.h',
+    '/libs/libaom/src/aom/aom_codec.h',
+    '/libs/libaom/src/aom/aom_decoder.h',
+    '/libs/libaom/src/aom/aom_encoder.h',
+    '/libs/libaom/src/aom/aom_frame_buffer.h',
+    '/libs/libaom/src/aom/aom_image.h',
+    '/libs/libaom/src/aom/aom_integer.h',
+    '/libs/libaom/src/aom/aomcx.h',
+    '/libs/libaom/src/aom/aomdx.h',
+    '/libs/libaom/src/aom_mem/aom_mem.h',
+    '/libs/libaom/src/aom_ports/aom_timer.h',
+    '/libs/libaom/src/aom_ports/bitops.h',
+    '/libs/libaom/src/aom_ports/mem.h',
+    '/libs/libaom/src/aom_ports/sanitizer.h',
+    '/libs/libaom/src/aom_ports/system_state.h',
+    '/libs/libaom/src/aom_scale/aom_scale.h',
+    '/libs/libaom/src/aom_scale/yv12config.h',
+  ],
+  'X64_SOURCES': [
+    '/libs/libaom/src/aom/src/aom_codec.c',
+    '/libs/libaom/src/aom/src/aom_decoder.c',
+    '/libs/libaom/src/aom/src/aom_encoder.c',
+    '/libs/libaom/src/aom/src/aom_image.c',
+    '/libs/libaom/src/aom/src/aom_integer.c',
+    '/libs/libaom/src/aom_dsp/aom_convolve.c',
+    '/libs/libaom/src/aom_dsp/aom_dsp_rtcd.c',
+    '/libs/libaom/src/aom_dsp/avg.c',
+    '/libs/libaom/src/aom_dsp/binary_codes_reader.c',
+    '/libs/libaom/src/aom_dsp/bitreader.c',
+    '/libs/libaom/src/aom_dsp/bitreader_buffer.c',
+    '/libs/libaom/src/aom_dsp/bitwriter_buffer.c',
+    '/libs/libaom/src/aom_dsp/blend_a64_hmask.c',
+    '/libs/libaom/src/aom_dsp/blend_a64_mask.c',
+    '/libs/libaom/src/aom_dsp/blend_a64_vmask.c',
+    '/libs/libaom/src/aom_dsp/entcode.c',
+    '/libs/libaom/src/aom_dsp/entdec.c',
+    '/libs/libaom/src/aom_dsp/fft.c',
+    '/libs/libaom/src/aom_dsp/grain_synthesis.c',
+    '/libs/libaom/src/aom_dsp/intrapred.c',
+    '/libs/libaom/src/aom_dsp/loopfilter.c',
+    '/libs/libaom/src/aom_dsp/subtract.c',
+    '/libs/libaom/src/aom_dsp/x86/aom_asm_stubs.c',
+    '/libs/libaom/src/aom_dsp/x86/aom_convolve_copy_sse2.asm',
+    '/libs/libaom/src/aom_dsp/x86/aom_high_subpixel_8t_sse2.asm',
+    '/libs/libaom/src/aom_dsp/x86/aom_high_subpixel_bilinear_sse2.asm',
+    '/libs/libaom/src/aom_dsp/x86/aom_subpixel_8t_intrin_avx2.c',
+    '/libs/libaom/src/aom_dsp/x86/aom_subpixel_8t_intrin_sse2.c',
+    '/libs/libaom/src/aom_dsp/x86/aom_subpixel_8t_intrin_ssse3.c',
+    '/libs/libaom/src/aom_dsp/x86/aom_subpixel_8t_sse2.asm',
+    '/libs/libaom/src/aom_dsp/x86/aom_subpixel_8t_ssse3.asm',
+    '/libs/libaom/src/aom_dsp/x86/aom_subpixel_bilinear_sse2.asm',
+    '/libs/libaom/src/aom_dsp/x86/aom_subpixel_bilinear_ssse3.asm',
+    '/libs/libaom/src/aom_dsp/x86/avg_intrin_avx2.c',
+    '/libs/libaom/src/aom_dsp/x86/avg_intrin_sse2.c',
+    '/libs/libaom/src/aom_dsp/x86/blend_a64_hmask_sse4.c',
+    '/libs/libaom/src/aom_dsp/x86/blend_a64_mask_avx2.c',
+    '/libs/libaom/src/aom_dsp/x86/blend_a64_mask_sse4.c',
+    '/libs/libaom/src/aom_dsp/x86/blend_a64_vmask_sse4.c',
+    '/libs/libaom/src/aom_dsp/x86/fft_avx2.c',
+    '/libs/libaom/src/aom_dsp/x86/fft_sse2.c',
+    '/libs/libaom/src/aom_dsp/x86/highbd_convolve_avx2.c',
+    '/libs/libaom/src/aom_dsp/x86/highbd_convolve_sse2.c',
+    '/libs/libaom/src/aom_dsp/x86/highbd_convolve_ssse3.c',
+    '/libs/libaom/src/aom_dsp/x86/highbd_intrapred_asm_sse2.asm',
+    '/libs/libaom/src/aom_dsp/x86/highbd_intrapred_sse2.c',
+    '/libs/libaom/src/aom_dsp/x86/highbd_loopfilter_avx2.c',
+    '/libs/libaom/src/aom_dsp/x86/highbd_loopfilter_sse2.c',
+    '/libs/libaom/src/aom_dsp/x86/intrapred_asm_sse2.asm',
+    '/libs/libaom/src/aom_dsp/x86/intrapred_avx2.c',
+    '/libs/libaom/src/aom_dsp/x86/intrapred_sse2.c',
+    '/libs/libaom/src/aom_dsp/x86/intrapred_ssse3.c',
+    '/libs/libaom/src/aom_dsp/x86/inv_wht_sse2.asm',
+    '/libs/libaom/src/aom_dsp/x86/loopfilter_sse2.c',
+    '/libs/libaom/src/aom_mem/aom_mem.c',
+    '/libs/libaom/src/aom_ports/emms.asm',
+    '/libs/libaom/src/aom_scale/aom_scale_rtcd.c',
+    '/libs/libaom/src/aom_scale/generic/aom_scale.c',
+    '/libs/libaom/src/aom_scale/generic/gen_scalers.c',
+    '/libs/libaom/src/aom_scale/generic/yv12config.c',
+    '/libs/libaom/src/aom_scale/generic/yv12extend.c',
+    '/libs/libaom/src/aom_util/aom_thread.c',
+    '/libs/libaom/src/aom_util/debug_util.c',
+    '/libs/libaom/src/av1/av1_dx_iface.c',
+    '/libs/libaom/src/av1/common/alloccommon.c',
+    '/libs/libaom/src/av1/common/av1_inv_txfm1d.c',
+    '/libs/libaom/src/av1/common/av1_inv_txfm2d.c',
+    '/libs/libaom/src/av1/common/av1_loopfilter.c',
+    '/libs/libaom/src/av1/common/av1_rtcd.c',
+    '/libs/libaom/src/av1/common/av1_txfm.c',
+    '/libs/libaom/src/av1/common/blockd.c',
+    '/libs/libaom/src/av1/common/cdef.c',
+    '/libs/libaom/src/av1/common/cdef_block.c',
+    '/libs/libaom/src/av1/common/cdef_block_avx2.c',
+    '/libs/libaom/src/av1/common/cdef_block_sse2.c',
+    '/libs/libaom/src/av1/common/cdef_block_sse4.c',
+    '/libs/libaom/src/av1/common/cdef_block_ssse3.c',
+    '/libs/libaom/src/av1/common/cfl.c',
+    '/libs/libaom/src/av1/common/convolve.c',
+    '/libs/libaom/src/av1/common/debugmodes.c',
+    '/libs/libaom/src/av1/common/entropy.c',
+    '/libs/libaom/src/av1/common/entropymode.c',
+    '/libs/libaom/src/av1/common/entropymv.c',
+    '/libs/libaom/src/av1/common/frame_buffers.c',
+    '/libs/libaom/src/av1/common/idct.c',
+    '/libs/libaom/src/av1/common/mvref_common.c',
+    '/libs/libaom/src/av1/common/obu_util.c',
+    '/libs/libaom/src/av1/common/odintrin.c',
+    '/libs/libaom/src/av1/common/pred_common.c',
+    '/libs/libaom/src/av1/common/quant_common.c',
+    '/libs/libaom/src/av1/common/reconinter.c',
+    '/libs/libaom/src/av1/common/reconintra.c',
+    '/libs/libaom/src/av1/common/resize.c',
+    '/libs/libaom/src/av1/common/restoration.c',
+    '/libs/libaom/src/av1/common/scale.c',
+    '/libs/libaom/src/av1/common/scan.c',
+    '/libs/libaom/src/av1/common/seg_common.c',
+    '/libs/libaom/src/av1/common/thread_common.c',
+    '/libs/libaom/src/av1/common/tile_common.c',
+    '/libs/libaom/src/av1/common/timing.c',
+    '/libs/libaom/src/av1/common/txb_common.c',
+    '/libs/libaom/src/av1/common/warped_motion.c',
+    '/libs/libaom/src/av1/common/x86/av1_convolve_horiz_rs_sse4.c',
+    '/libs/libaom/src/av1/common/x86/av1_convolve_scale_sse4.c',
+    '/libs/libaom/src/av1/common/x86/av1_inv_txfm_avx2.c',
+    '/libs/libaom/src/av1/common/x86/av1_inv_txfm_ssse3.c',
+    '/libs/libaom/src/av1/common/x86/av1_txfm_sse4.c',
+    '/libs/libaom/src/av1/common/x86/cfl_avx2.c',
+    '/libs/libaom/src/av1/common/x86/cfl_sse2.c',
+    '/libs/libaom/src/av1/common/x86/cfl_ssse3.c',
+    '/libs/libaom/src/av1/common/x86/convolve_2d_avx2.c',
+    '/libs/libaom/src/av1/common/x86/convolve_2d_sse2.c',
+    '/libs/libaom/src/av1/common/x86/convolve_avx2.c',
+    '/libs/libaom/src/av1/common/x86/convolve_sse2.c',
+    '/libs/libaom/src/av1/common/x86/filterintra_sse4.c',
+    '/libs/libaom/src/av1/common/x86/highbd_convolve_2d_avx2.c',
+    '/libs/libaom/src/av1/common/x86/highbd_convolve_2d_sse2.c',
+    '/libs/libaom/src/av1/common/x86/highbd_convolve_2d_sse4.c',
+    '/libs/libaom/src/av1/common/x86/highbd_convolve_2d_ssse3.c',
+    '/libs/libaom/src/av1/common/x86/highbd_inv_txfm_avx2.c',
+    '/libs/libaom/src/av1/common/x86/highbd_inv_txfm_sse4.c',
+    '/libs/libaom/src/av1/common/x86/highbd_jnt_convolve_avx2.c',
+    '/libs/libaom/src/av1/common/x86/highbd_jnt_convolve_sse4.c',
+    '/libs/libaom/src/av1/common/x86/highbd_warp_plane_sse4.c',
+    '/libs/libaom/src/av1/common/x86/highbd_wiener_convolve_avx2.c',
+    '/libs/libaom/src/av1/common/x86/highbd_wiener_convolve_ssse3.c',
+    '/libs/libaom/src/av1/common/x86/intra_edge_sse4.c',
+    '/libs/libaom/src/av1/common/x86/jnt_convolve_avx2.c',
+    '/libs/libaom/src/av1/common/x86/jnt_convolve_sse2.c',
+    '/libs/libaom/src/av1/common/x86/jnt_convolve_ssse3.c',
+    '/libs/libaom/src/av1/common/x86/reconinter_avx2.c',
+    '/libs/libaom/src/av1/common/x86/reconinter_sse4.c',
+    '/libs/libaom/src/av1/common/x86/reconinter_ssse3.c',
+    '/libs/libaom/src/av1/common/x86/selfguided_avx2.c',
+    '/libs/libaom/src/av1/common/x86/selfguided_sse4.c',
+    '/libs/libaom/src/av1/common/x86/warp_plane_avx2.c',
+    '/libs/libaom/src/av1/common/x86/warp_plane_sse2.c',
+    '/libs/libaom/src/av1/common/x86/warp_plane_sse4.c',
+    '/libs/libaom/src/av1/common/x86/wiener_convolve_avx2.c',
+    '/libs/libaom/src/av1/common/x86/wiener_convolve_sse2.c',
+    '/libs/libaom/src/av1/decoder/decodeframe.c',
+    '/libs/libaom/src/av1/decoder/decodemv.c',
+    '/libs/libaom/src/av1/decoder/decoder.c',
+    '/libs/libaom/src/av1/decoder/decodetxb.c',
+    '/libs/libaom/src/av1/decoder/detokenize.c',
+    '/libs/libaom/src/av1/decoder/obu.c',
+  ],
+}
diff --git a/media/libaom/src/.clang-format b/libs/libaom/src/.clang-format
index a37882007..a37882007 100644
--- a/media/libaom/src/.clang-format
+++ b/libs/libaom/src/.clang-format
diff --git a/media/libaom/src/.cmake-format.py b/libs/libaom/src/.cmake-format.py
index 7b0e4f08d..7b0e4f08d 100644
--- a/media/libaom/src/.cmake-format.py
+++ b/libs/libaom/src/.cmake-format.py
diff --git a/media/libaom/src/.gitattributes b/libs/libaom/src/.gitattributes
index ffc6912a9..ffc6912a9 100644
--- a/media/libaom/src/.gitattributes
+++ b/libs/libaom/src/.gitattributes
diff --git a/media/libaom/src/.mailmap b/libs/libaom/src/.mailmap
index 30fae4de7..30fae4de7 100644
--- a/media/libaom/src/.mailmap
+++ b/libs/libaom/src/.mailmap
diff --git a/media/libaom/src/AUTHORS b/libs/libaom/src/AUTHORS
index f61026fc0..f61026fc0 100644
--- a/media/libaom/src/AUTHORS
+++ b/libs/libaom/src/AUTHORS
diff --git a/media/libaom/src/CHANGELOG b/libs/libaom/src/CHANGELOG
index 11da097af..11da097af 100644
--- a/media/libaom/src/CHANGELOG
+++ b/libs/libaom/src/CHANGELOG
diff --git a/media/libaom/src/CMakeLists.txt b/libs/libaom/src/CMakeLists.txt
index 84c8995a5..84c8995a5 100644
--- a/media/libaom/src/CMakeLists.txt
+++ b/libs/libaom/src/CMakeLists.txt
diff --git a/media/libaom/src/LICENSE b/libs/libaom/src/LICENSE
index fc340c376..fc340c376 100644
--- a/media/libaom/src/LICENSE
+++ b/libs/libaom/src/LICENSE
diff --git a/media/libaom/src/PATENTS b/libs/libaom/src/PATENTS
index 493f61637..493f61637 100644
--- a/media/libaom/src/PATENTS
+++ b/libs/libaom/src/PATENTS
diff --git a/media/libaom/src/README.md b/libs/libaom/src/README.md
index cf057ae6c..cf057ae6c 100644
--- a/media/libaom/src/README.md
+++ b/libs/libaom/src/README.md
diff --git a/media/libaom/src/Sample.cfg b/libs/libaom/src/Sample.cfg
index d5dbe6641..d5dbe6641 100644
--- a/media/libaom/src/Sample.cfg
+++ b/libs/libaom/src/Sample.cfg
diff --git a/media/libaom/src/aom/aom.h b/libs/libaom/src/aom/aom.h
index c591dc9a4..c591dc9a4 100644
--- a/media/libaom/src/aom/aom.h
+++ b/libs/libaom/src/aom/aom.h
diff --git a/media/libaom/src/aom/aom_codec.h b/libs/libaom/src/aom/aom_codec.h
index 75f6a1af2..75f6a1af2 100644
--- a/media/libaom/src/aom/aom_codec.h
+++ b/libs/libaom/src/aom/aom_codec.h
diff --git a/media/libaom/src/aom/aom_decoder.h b/libs/libaom/src/aom/aom_decoder.h
index 5ce7c7b10..5ce7c7b10 100644
--- a/media/libaom/src/aom/aom_decoder.h
+++ b/libs/libaom/src/aom/aom_decoder.h
diff --git a/media/libaom/src/aom/aom_encoder.h b/libs/libaom/src/aom/aom_encoder.h
index a494c17a4..a494c17a4 100644
--- a/media/libaom/src/aom/aom_encoder.h
+++ b/libs/libaom/src/aom/aom_encoder.h
diff --git a/media/libaom/src/aom/aom_frame_buffer.h b/libs/libaom/src/aom/aom_frame_buffer.h
index a715645a7..a715645a7 100644
--- a/media/libaom/src/aom/aom_frame_buffer.h
+++ b/libs/libaom/src/aom/aom_frame_buffer.h
diff --git a/media/libaom/src/aom/aom_image.h b/libs/libaom/src/aom/aom_image.h
index bb6973f9c..bb6973f9c 100644
--- a/media/libaom/src/aom/aom_image.h
+++ b/libs/libaom/src/aom/aom_image.h
diff --git a/media/libaom/src/aom/aom_integer.h b/libs/libaom/src/aom/aom_integer.h
index 113671e82..113671e82 100644
--- a/media/libaom/src/aom/aom_integer.h
+++ b/libs/libaom/src/aom/aom_integer.h
diff --git a/media/libaom/src/aom/aomcx.h b/libs/libaom/src/aom/aomcx.h
index 051d33e7b..051d33e7b 100644
--- a/media/libaom/src/aom/aomcx.h
+++ b/libs/libaom/src/aom/aomcx.h
diff --git a/media/libaom/src/aom/aomdx.h b/libs/libaom/src/aom/aomdx.h
index 8cd5de395..8cd5de395 100644
--- a/media/libaom/src/aom/aomdx.h
+++ b/libs/libaom/src/aom/aomdx.h
diff --git a/media/libaom/src/aom/exports_com b/libs/libaom/src/aom/exports_com
index 6f796f5db..6f796f5db 100644
--- a/media/libaom/src/aom/exports_com
+++ b/libs/libaom/src/aom/exports_com
diff --git a/media/libaom/src/aom/exports_dec b/libs/libaom/src/aom/exports_dec
index ffff023dd..ffff023dd 100644
--- a/media/libaom/src/aom/exports_dec
+++ b/libs/libaom/src/aom/exports_dec
diff --git a/media/libaom/src/aom/exports_enc b/libs/libaom/src/aom/exports_enc
index 1473d9d2b..1473d9d2b 100644
--- a/media/libaom/src/aom/exports_enc
+++ b/libs/libaom/src/aom/exports_enc
diff --git a/media/libaom/src/aom/exports_test b/libs/libaom/src/aom/exports_test
index 452a532ce..452a532ce 100644
--- a/media/libaom/src/aom/exports_test
+++ b/libs/libaom/src/aom/exports_test
diff --git a/media/libaom/src/aom/internal/aom_codec_internal.h b/libs/libaom/src/aom/internal/aom_codec_internal.h
index efe09acc9..efe09acc9 100644
--- a/media/libaom/src/aom/internal/aom_codec_internal.h
+++ b/libs/libaom/src/aom/internal/aom_codec_internal.h
diff --git a/media/libaom/src/aom/internal/aom_image_internal.h b/libs/libaom/src/aom/internal/aom_image_internal.h
index 7f2fd1891..7f2fd1891 100644
--- a/media/libaom/src/aom/internal/aom_image_internal.h
+++ b/libs/libaom/src/aom/internal/aom_image_internal.h
diff --git a/media/libaom/src/aom/src/aom_codec.c b/libs/libaom/src/aom/src/aom_codec.c
index 196ab8354..196ab8354 100644
--- a/media/libaom/src/aom/src/aom_codec.c
+++ b/libs/libaom/src/aom/src/aom_codec.c
diff --git a/media/libaom/src/aom/src/aom_decoder.c b/libs/libaom/src/aom/src/aom_decoder.c
index 49fff2635..49fff2635 100644
--- a/media/libaom/src/aom/src/aom_decoder.c
+++ b/libs/libaom/src/aom/src/aom_decoder.c
diff --git a/media/libaom/src/aom/src/aom_encoder.c b/libs/libaom/src/aom/src/aom_encoder.c
index bb51c9388..bb51c9388 100644
--- a/media/libaom/src/aom/src/aom_encoder.c
+++ b/libs/libaom/src/aom/src/aom_encoder.c
diff --git a/media/libaom/src/aom/src/aom_image.c b/libs/libaom/src/aom/src/aom_image.c
index cd0b5ed83..cd0b5ed83 100644
--- a/media/libaom/src/aom/src/aom_image.c
+++ b/libs/libaom/src/aom/src/aom_image.c
diff --git a/media/libaom/src/aom/src/aom_integer.c b/libs/libaom/src/aom/src/aom_integer.c
index 7edfd0de8..7edfd0de8 100644
--- a/media/libaom/src/aom/src/aom_integer.c
+++ b/libs/libaom/src/aom/src/aom_integer.c
diff --git a/media/libaom/src/aom_dsp/aom_convolve.c b/libs/libaom/src/aom_dsp/aom_convolve.c
index 7879b88f6..7879b88f6 100644
--- a/media/libaom/src/aom_dsp/aom_convolve.c
+++ b/libs/libaom/src/aom_dsp/aom_convolve.c
diff --git a/media/libaom/src/aom_dsp/aom_dsp.cmake b/libs/libaom/src/aom_dsp/aom_dsp.cmake
index f1b61f010..f1b61f010 100644
--- a/media/libaom/src/aom_dsp/aom_dsp.cmake
+++ b/libs/libaom/src/aom_dsp/aom_dsp.cmake
diff --git a/media/libaom/src/aom_dsp/aom_dsp_common.h b/libs/libaom/src/aom_dsp/aom_dsp_common.h
index 150d35dd1..150d35dd1 100644
--- a/media/libaom/src/aom_dsp/aom_dsp_common.h
+++ b/libs/libaom/src/aom_dsp/aom_dsp_common.h
diff --git a/media/libaom/src/aom_dsp/aom_dsp_rtcd.c b/libs/libaom/src/aom_dsp/aom_dsp_rtcd.c
index 1514bd64e..1514bd64e 100644
--- a/media/libaom/src/aom_dsp/aom_dsp_rtcd.c
+++ b/libs/libaom/src/aom_dsp/aom_dsp_rtcd.c
diff --git a/media/libaom/src/aom_dsp/aom_dsp_rtcd_defs.pl b/libs/libaom/src/aom_dsp/aom_dsp_rtcd_defs.pl
index b7d5a41ba..b7d5a41ba 100644
--- a/media/libaom/src/aom_dsp/aom_dsp_rtcd_defs.pl
+++ b/libs/libaom/src/aom_dsp/aom_dsp_rtcd_defs.pl
diff --git a/media/libaom/src/aom_dsp/aom_filter.h b/libs/libaom/src/aom_dsp/aom_filter.h
index 00686ac38..00686ac38 100644
--- a/media/libaom/src/aom_dsp/aom_filter.h
+++ b/libs/libaom/src/aom_dsp/aom_filter.h
diff --git a/media/libaom/src/aom_dsp/aom_simd.h b/libs/libaom/src/aom_dsp/aom_simd.h
index ab950ca55..ab950ca55 100644
--- a/media/libaom/src/aom_dsp/aom_simd.h
+++ b/libs/libaom/src/aom_dsp/aom_simd.h
diff --git a/media/libaom/src/aom_dsp/aom_simd_inline.h b/libs/libaom/src/aom_dsp/aom_simd_inline.h
index eb333f6f6..eb333f6f6 100644
--- a/media/libaom/src/aom_dsp/aom_simd_inline.h
+++ b/libs/libaom/src/aom_dsp/aom_simd_inline.h
diff --git a/media/libaom/src/aom_dsp/arm/avg_neon.c b/libs/libaom/src/aom_dsp/arm/avg_neon.c
index af3769edf..af3769edf 100644
--- a/media/libaom/src/aom_dsp/arm/avg_neon.c
+++ b/libs/libaom/src/aom_dsp/arm/avg_neon.c
diff --git a/media/libaom/src/aom_dsp/arm/blend_a64_mask_neon.c b/libs/libaom/src/aom_dsp/arm/blend_a64_mask_neon.c
index e7f08a5fd..e7f08a5fd 100644
--- a/media/libaom/src/aom_dsp/arm/blend_a64_mask_neon.c
+++ b/libs/libaom/src/aom_dsp/arm/blend_a64_mask_neon.c
diff --git a/media/libaom/src/aom_dsp/arm/fwd_txfm_neon.c b/libs/libaom/src/aom_dsp/arm/fwd_txfm_neon.c
index ce9352347..ce9352347 100644
--- a/media/libaom/src/aom_dsp/arm/fwd_txfm_neon.c
+++ b/libs/libaom/src/aom_dsp/arm/fwd_txfm_neon.c
diff --git a/media/libaom/src/aom_dsp/arm/hadamard_neon.c b/libs/libaom/src/aom_dsp/arm/hadamard_neon.c
index 929792ab3..929792ab3 100644
--- a/media/libaom/src/aom_dsp/arm/hadamard_neon.c
+++ b/libs/libaom/src/aom_dsp/arm/hadamard_neon.c
diff --git a/media/libaom/src/aom_dsp/arm/intrapred_neon.c b/libs/libaom/src/aom_dsp/arm/intrapred_neon.c
index c85b1e910..c85b1e910 100644
--- a/media/libaom/src/aom_dsp/arm/intrapred_neon.c
+++ b/libs/libaom/src/aom_dsp/arm/intrapred_neon.c
diff --git a/media/libaom/src/aom_dsp/arm/loopfilter_neon.c b/libs/libaom/src/aom_dsp/arm/loopfilter_neon.c
index aafac8966..aafac8966 100644
--- a/media/libaom/src/aom_dsp/arm/loopfilter_neon.c
+++ b/libs/libaom/src/aom_dsp/arm/loopfilter_neon.c
diff --git a/media/libaom/src/aom_dsp/arm/sad4d_neon.c b/libs/libaom/src/aom_dsp/arm/sad4d_neon.c
index 606950ab2..606950ab2 100644
--- a/media/libaom/src/aom_dsp/arm/sad4d_neon.c
+++ b/libs/libaom/src/aom_dsp/arm/sad4d_neon.c
diff --git a/media/libaom/src/aom_dsp/arm/sad_neon.c b/libs/libaom/src/aom_dsp/arm/sad_neon.c
index a39de91d6..a39de91d6 100644
--- a/media/libaom/src/aom_dsp/arm/sad_neon.c
+++ b/libs/libaom/src/aom_dsp/arm/sad_neon.c
diff --git a/media/libaom/src/aom_dsp/arm/sse_neon.c b/libs/libaom/src/aom_dsp/arm/sse_neon.c
index 06b81cc3d..06b81cc3d 100644
--- a/media/libaom/src/aom_dsp/arm/sse_neon.c
+++ b/libs/libaom/src/aom_dsp/arm/sse_neon.c
diff --git a/media/libaom/src/aom_dsp/arm/subpel_variance_neon.c b/libs/libaom/src/aom_dsp/arm/subpel_variance_neon.c
index cf618eee7..cf618eee7 100644
--- a/media/libaom/src/aom_dsp/arm/subpel_variance_neon.c
+++ b/libs/libaom/src/aom_dsp/arm/subpel_variance_neon.c
diff --git a/media/libaom/src/aom_dsp/arm/subtract_neon.c b/libs/libaom/src/aom_dsp/arm/subtract_neon.c
index 28f5ace8e..28f5ace8e 100644
--- a/media/libaom/src/aom_dsp/arm/subtract_neon.c
+++ b/libs/libaom/src/aom_dsp/arm/subtract_neon.c
diff --git a/media/libaom/src/aom_dsp/arm/sum_neon.h b/libs/libaom/src/aom_dsp/arm/sum_neon.h
index 809e51ce1..809e51ce1 100644
--- a/media/libaom/src/aom_dsp/arm/sum_neon.h
+++ b/libs/libaom/src/aom_dsp/arm/sum_neon.h
diff --git a/media/libaom/src/aom_dsp/arm/variance_neon.c b/libs/libaom/src/aom_dsp/arm/variance_neon.c
index d4107ce0d..d4107ce0d 100644
--- a/media/libaom/src/aom_dsp/arm/variance_neon.c
+++ b/libs/libaom/src/aom_dsp/arm/variance_neon.c
diff --git a/media/libaom/src/aom_dsp/avg.c b/libs/libaom/src/aom_dsp/avg.c
index 7386296fd..7386296fd 100644
--- a/media/libaom/src/aom_dsp/avg.c
+++ b/libs/libaom/src/aom_dsp/avg.c
diff --git a/media/libaom/src/aom_dsp/binary_codes_reader.c b/libs/libaom/src/aom_dsp/binary_codes_reader.c
index 7cd903d82..7cd903d82 100644
--- a/media/libaom/src/aom_dsp/binary_codes_reader.c
+++ b/libs/libaom/src/aom_dsp/binary_codes_reader.c
diff --git a/media/libaom/src/aom_dsp/binary_codes_reader.h b/libs/libaom/src/aom_dsp/binary_codes_reader.h
index d218f0619..d218f0619 100644
--- a/media/libaom/src/aom_dsp/binary_codes_reader.h
+++ b/libs/libaom/src/aom_dsp/binary_codes_reader.h
diff --git a/media/libaom/src/aom_dsp/binary_codes_writer.c b/libs/libaom/src/aom_dsp/binary_codes_writer.c
index adf1c1304..adf1c1304 100644
--- a/media/libaom/src/aom_dsp/binary_codes_writer.c
+++ b/libs/libaom/src/aom_dsp/binary_codes_writer.c
diff --git a/media/libaom/src/aom_dsp/binary_codes_writer.h b/libs/libaom/src/aom_dsp/binary_codes_writer.h
index 5ec866213..5ec866213 100644
--- a/media/libaom/src/aom_dsp/binary_codes_writer.h
+++ b/libs/libaom/src/aom_dsp/binary_codes_writer.h
diff --git a/media/libaom/src/aom_dsp/bitreader.c b/libs/libaom/src/aom_dsp/bitreader.c
index 4c70a9171..4c70a9171 100644
--- a/media/libaom/src/aom_dsp/bitreader.c
+++ b/libs/libaom/src/aom_dsp/bitreader.c
diff --git a/media/libaom/src/aom_dsp/bitreader.h b/libs/libaom/src/aom_dsp/bitreader.h
index a8b3f55ef..a8b3f55ef 100644
--- a/media/libaom/src/aom_dsp/bitreader.h
+++ b/libs/libaom/src/aom_dsp/bitreader.h
diff --git a/media/libaom/src/aom_dsp/bitreader_buffer.c b/libs/libaom/src/aom_dsp/bitreader_buffer.c
index d79feea6a..d79feea6a 100644
--- a/media/libaom/src/aom_dsp/bitreader_buffer.c
+++ b/libs/libaom/src/aom_dsp/bitreader_buffer.c
diff --git a/media/libaom/src/aom_dsp/bitreader_buffer.h b/libs/libaom/src/aom_dsp/bitreader_buffer.h
index 359fbe519..359fbe519 100644
--- a/media/libaom/src/aom_dsp/bitreader_buffer.h
+++ b/libs/libaom/src/aom_dsp/bitreader_buffer.h
diff --git a/media/libaom/src/aom_dsp/bitwriter.c b/libs/libaom/src/aom_dsp/bitwriter.c
index 41fcc5175..41fcc5175 100644
--- a/media/libaom/src/aom_dsp/bitwriter.c
+++ b/libs/libaom/src/aom_dsp/bitwriter.c
diff --git a/media/libaom/src/aom_dsp/bitwriter.h b/libs/libaom/src/aom_dsp/bitwriter.h
index 4e77a1794..4e77a1794 100644
--- a/media/libaom/src/aom_dsp/bitwriter.h
+++ b/libs/libaom/src/aom_dsp/bitwriter.h
diff --git a/media/libaom/src/aom_dsp/bitwriter_buffer.c b/libs/libaom/src/aom_dsp/bitwriter_buffer.c
index 7d0ab9486..7d0ab9486 100644
--- a/media/libaom/src/aom_dsp/bitwriter_buffer.c
+++ b/libs/libaom/src/aom_dsp/bitwriter_buffer.c
diff --git a/media/libaom/src/aom_dsp/bitwriter_buffer.h b/libs/libaom/src/aom_dsp/bitwriter_buffer.h
index fd10e01bb..fd10e01bb 100644
--- a/media/libaom/src/aom_dsp/bitwriter_buffer.h
+++ b/libs/libaom/src/aom_dsp/bitwriter_buffer.h
diff --git a/media/libaom/src/aom_dsp/blend.h b/libs/libaom/src/aom_dsp/blend.h
index fd87dc181..fd87dc181 100644
--- a/media/libaom/src/aom_dsp/blend.h
+++ b/libs/libaom/src/aom_dsp/blend.h
diff --git a/media/libaom/src/aom_dsp/blend_a64_hmask.c b/libs/libaom/src/aom_dsp/blend_a64_hmask.c
index e9e38ef96..e9e38ef96 100644
--- a/media/libaom/src/aom_dsp/blend_a64_hmask.c
+++ b/libs/libaom/src/aom_dsp/blend_a64_hmask.c
diff --git a/media/libaom/src/aom_dsp/blend_a64_mask.c b/libs/libaom/src/aom_dsp/blend_a64_mask.c
index 32f2dc6d8..32f2dc6d8 100644
--- a/media/libaom/src/aom_dsp/blend_a64_mask.c
+++ b/libs/libaom/src/aom_dsp/blend_a64_mask.c
diff --git a/media/libaom/src/aom_dsp/blend_a64_vmask.c b/libs/libaom/src/aom_dsp/blend_a64_vmask.c
index c938bb33a..c938bb33a 100644
--- a/media/libaom/src/aom_dsp/blend_a64_vmask.c
+++ b/libs/libaom/src/aom_dsp/blend_a64_vmask.c
diff --git a/media/libaom/src/aom_dsp/blk_sse_sum.c b/libs/libaom/src/aom_dsp/blk_sse_sum.c
index d76c3f87b..d76c3f87b 100644
--- a/media/libaom/src/aom_dsp/blk_sse_sum.c
+++ b/libs/libaom/src/aom_dsp/blk_sse_sum.c
diff --git a/media/libaom/src/aom_dsp/entcode.c b/libs/libaom/src/aom_dsp/entcode.c
index aad96c6fc..aad96c6fc 100644
--- a/media/libaom/src/aom_dsp/entcode.c
+++ b/libs/libaom/src/aom_dsp/entcode.c
diff --git a/media/libaom/src/aom_dsp/entcode.h b/libs/libaom/src/aom_dsp/entcode.h
index 751887921..751887921 100644
--- a/media/libaom/src/aom_dsp/entcode.h
+++ b/libs/libaom/src/aom_dsp/entcode.h
diff --git a/media/libaom/src/aom_dsp/entdec.c b/libs/libaom/src/aom_dsp/entdec.c
index da43e8a39..da43e8a39 100644
--- a/media/libaom/src/aom_dsp/entdec.c
+++ b/libs/libaom/src/aom_dsp/entdec.c
diff --git a/media/libaom/src/aom_dsp/entdec.h b/libs/libaom/src/aom_dsp/entdec.h
index c74616777..c74616777 100644
--- a/media/libaom/src/aom_dsp/entdec.h
+++ b/libs/libaom/src/aom_dsp/entdec.h
diff --git a/media/libaom/src/aom_dsp/entenc.c b/libs/libaom/src/aom_dsp/entenc.c
index 2fd4493ea..2fd4493ea 100644
--- a/media/libaom/src/aom_dsp/entenc.c
+++ b/libs/libaom/src/aom_dsp/entenc.c
diff --git a/media/libaom/src/aom_dsp/entenc.h b/libs/libaom/src/aom_dsp/entenc.h
index 3551d4250..3551d4250 100644
--- a/media/libaom/src/aom_dsp/entenc.h
+++ b/libs/libaom/src/aom_dsp/entenc.h
diff --git a/media/libaom/src/aom_dsp/fastssim.c b/libs/libaom/src/aom_dsp/fastssim.c
index 3804519b3..3804519b3 100644
--- a/media/libaom/src/aom_dsp/fastssim.c
+++ b/libs/libaom/src/aom_dsp/fastssim.c
diff --git a/media/libaom/src/aom_dsp/fft.c b/libs/libaom/src/aom_dsp/fft.c
index 0ba71cfb3..0ba71cfb3 100644
--- a/media/libaom/src/aom_dsp/fft.c
+++ b/libs/libaom/src/aom_dsp/fft.c
diff --git a/media/libaom/src/aom_dsp/fft_common.h b/libs/libaom/src/aom_dsp/fft_common.h
index 5137331ae..5137331ae 100644
--- a/media/libaom/src/aom_dsp/fft_common.h
+++ b/libs/libaom/src/aom_dsp/fft_common.h
diff --git a/media/libaom/src/aom_dsp/fwd_txfm.c b/libs/libaom/src/aom_dsp/fwd_txfm.c
index 3d3044415..3d3044415 100644
--- a/media/libaom/src/aom_dsp/fwd_txfm.c
+++ b/libs/libaom/src/aom_dsp/fwd_txfm.c
diff --git a/media/libaom/src/aom_dsp/grain_synthesis.c b/libs/libaom/src/aom_dsp/grain_synthesis.c
index 626eb76af..626eb76af 100644
--- a/media/libaom/src/aom_dsp/grain_synthesis.c
+++ b/libs/libaom/src/aom_dsp/grain_synthesis.c
diff --git a/media/libaom/src/aom_dsp/grain_synthesis.h b/libs/libaom/src/aom_dsp/grain_synthesis.h
index 9155b3903..9155b3903 100644
--- a/media/libaom/src/aom_dsp/grain_synthesis.h
+++ b/libs/libaom/src/aom_dsp/grain_synthesis.h
diff --git a/media/libaom/src/aom_dsp/grain_table.c b/libs/libaom/src/aom_dsp/grain_table.c
index e03f04d5d..e03f04d5d 100644
--- a/media/libaom/src/aom_dsp/grain_table.c
+++ b/libs/libaom/src/aom_dsp/grain_table.c
diff --git a/media/libaom/src/aom_dsp/grain_table.h b/libs/libaom/src/aom_dsp/grain_table.h
index a8ac50730..a8ac50730 100644
--- a/media/libaom/src/aom_dsp/grain_table.h
+++ b/libs/libaom/src/aom_dsp/grain_table.h
diff --git a/media/libaom/src/aom_dsp/intrapred.c b/libs/libaom/src/aom_dsp/intrapred.c
index 72ccfd835..72ccfd835 100644
--- a/media/libaom/src/aom_dsp/intrapred.c
+++ b/libs/libaom/src/aom_dsp/intrapred.c
diff --git a/media/libaom/src/aom_dsp/intrapred_common.h b/libs/libaom/src/aom_dsp/intrapred_common.h
index 3ec62a86e..3ec62a86e 100644
--- a/media/libaom/src/aom_dsp/intrapred_common.h
+++ b/libs/libaom/src/aom_dsp/intrapred_common.h
diff --git a/media/libaom/src/aom_dsp/loopfilter.c b/libs/libaom/src/aom_dsp/loopfilter.c
index 903ebcd7c..903ebcd7c 100644
--- a/media/libaom/src/aom_dsp/loopfilter.c
+++ b/libs/libaom/src/aom_dsp/loopfilter.c
diff --git a/media/libaom/src/aom_dsp/mips/aom_convolve8_horiz_msa.c b/libs/libaom/src/aom_dsp/mips/aom_convolve8_horiz_msa.c
index c8ab61249..c8ab61249 100644
--- a/media/libaom/src/aom_dsp/mips/aom_convolve8_horiz_msa.c
+++ b/libs/libaom/src/aom_dsp/mips/aom_convolve8_horiz_msa.c
diff --git a/media/libaom/src/aom_dsp/mips/aom_convolve8_vert_msa.c b/libs/libaom/src/aom_dsp/mips/aom_convolve8_vert_msa.c
index 2c3bc084c..2c3bc084c 100644
--- a/media/libaom/src/aom_dsp/mips/aom_convolve8_vert_msa.c
+++ b/libs/libaom/src/aom_dsp/mips/aom_convolve8_vert_msa.c
diff --git a/media/libaom/src/aom_dsp/mips/aom_convolve_copy_msa.c b/libs/libaom/src/aom_dsp/mips/aom_convolve_copy_msa.c
index f7f116f4d..f7f116f4d 100644
--- a/media/libaom/src/aom_dsp/mips/aom_convolve_copy_msa.c
+++ b/libs/libaom/src/aom_dsp/mips/aom_convolve_copy_msa.c
diff --git a/media/libaom/src/aom_dsp/mips/aom_convolve_msa.h b/libs/libaom/src/aom_dsp/mips/aom_convolve_msa.h
index 852415c20..852415c20 100644
--- a/media/libaom/src/aom_dsp/mips/aom_convolve_msa.h
+++ b/libs/libaom/src/aom_dsp/mips/aom_convolve_msa.h
diff --git a/media/libaom/src/aom_dsp/mips/common_dspr2.c b/libs/libaom/src/aom_dsp/mips/common_dspr2.c
index 00ab75dc3..00ab75dc3 100644
--- a/media/libaom/src/aom_dsp/mips/common_dspr2.c
+++ b/libs/libaom/src/aom_dsp/mips/common_dspr2.c
diff --git a/media/libaom/src/aom_dsp/mips/common_dspr2.h b/libs/libaom/src/aom_dsp/mips/common_dspr2.h
index c42188d62..c42188d62 100644
--- a/media/libaom/src/aom_dsp/mips/common_dspr2.h
+++ b/libs/libaom/src/aom_dsp/mips/common_dspr2.h
diff --git a/media/libaom/src/aom_dsp/mips/convolve2_dspr2.c b/libs/libaom/src/aom_dsp/mips/convolve2_dspr2.c
index 08bf1ab30..08bf1ab30 100644
--- a/media/libaom/src/aom_dsp/mips/convolve2_dspr2.c
+++ b/libs/libaom/src/aom_dsp/mips/convolve2_dspr2.c
diff --git a/media/libaom/src/aom_dsp/mips/convolve2_horiz_dspr2.c b/libs/libaom/src/aom_dsp/mips/convolve2_horiz_dspr2.c
index 097da73ca..097da73ca 100644
--- a/media/libaom/src/aom_dsp/mips/convolve2_horiz_dspr2.c
+++ b/libs/libaom/src/aom_dsp/mips/convolve2_horiz_dspr2.c
diff --git a/media/libaom/src/aom_dsp/mips/convolve2_vert_dspr2.c b/libs/libaom/src/aom_dsp/mips/convolve2_vert_dspr2.c
index 40abfd89e..40abfd89e 100644
--- a/media/libaom/src/aom_dsp/mips/convolve2_vert_dspr2.c
+++ b/libs/libaom/src/aom_dsp/mips/convolve2_vert_dspr2.c
diff --git a/media/libaom/src/aom_dsp/mips/convolve8_dspr2.c b/libs/libaom/src/aom_dsp/mips/convolve8_dspr2.c
index af54b4264..af54b4264 100644
--- a/media/libaom/src/aom_dsp/mips/convolve8_dspr2.c
+++ b/libs/libaom/src/aom_dsp/mips/convolve8_dspr2.c
diff --git a/media/libaom/src/aom_dsp/mips/convolve8_horiz_dspr2.c b/libs/libaom/src/aom_dsp/mips/convolve8_horiz_dspr2.c
index f9c6879ab..f9c6879ab 100644
--- a/media/libaom/src/aom_dsp/mips/convolve8_horiz_dspr2.c
+++ b/libs/libaom/src/aom_dsp/mips/convolve8_horiz_dspr2.c
diff --git a/media/libaom/src/aom_dsp/mips/convolve8_vert_dspr2.c b/libs/libaom/src/aom_dsp/mips/convolve8_vert_dspr2.c
index 201e66427..201e66427 100644
--- a/media/libaom/src/aom_dsp/mips/convolve8_vert_dspr2.c
+++ b/libs/libaom/src/aom_dsp/mips/convolve8_vert_dspr2.c
diff --git a/media/libaom/src/aom_dsp/mips/convolve_common_dspr2.h b/libs/libaom/src/aom_dsp/mips/convolve_common_dspr2.h
index e5d48a884..e5d48a884 100644
--- a/media/libaom/src/aom_dsp/mips/convolve_common_dspr2.h
+++ b/libs/libaom/src/aom_dsp/mips/convolve_common_dspr2.h
diff --git a/media/libaom/src/aom_dsp/mips/intrapred16_dspr2.c b/libs/libaom/src/aom_dsp/mips/intrapred16_dspr2.c
index 7c221ae89..7c221ae89 100644
--- a/media/libaom/src/aom_dsp/mips/intrapred16_dspr2.c
+++ b/libs/libaom/src/aom_dsp/mips/intrapred16_dspr2.c
diff --git a/media/libaom/src/aom_dsp/mips/intrapred4_dspr2.c b/libs/libaom/src/aom_dsp/mips/intrapred4_dspr2.c
index 0a21979c7..0a21979c7 100644
--- a/media/libaom/src/aom_dsp/mips/intrapred4_dspr2.c
+++ b/libs/libaom/src/aom_dsp/mips/intrapred4_dspr2.c
diff --git a/media/libaom/src/aom_dsp/mips/intrapred8_dspr2.c b/libs/libaom/src/aom_dsp/mips/intrapred8_dspr2.c
index d42a77c80..d42a77c80 100644
--- a/media/libaom/src/aom_dsp/mips/intrapred8_dspr2.c
+++ b/libs/libaom/src/aom_dsp/mips/intrapred8_dspr2.c
diff --git a/media/libaom/src/aom_dsp/mips/intrapred_msa.c b/libs/libaom/src/aom_dsp/mips/intrapred_msa.c
index 9f25cc1ca..9f25cc1ca 100644
--- a/media/libaom/src/aom_dsp/mips/intrapred_msa.c
+++ b/libs/libaom/src/aom_dsp/mips/intrapred_msa.c
diff --git a/media/libaom/src/aom_dsp/mips/loopfilter_16_msa.c b/libs/libaom/src/aom_dsp/mips/loopfilter_16_msa.c
index 38a10e9b2..38a10e9b2 100644
--- a/media/libaom/src/aom_dsp/mips/loopfilter_16_msa.c
+++ b/libs/libaom/src/aom_dsp/mips/loopfilter_16_msa.c
diff --git a/media/libaom/src/aom_dsp/mips/loopfilter_4_msa.c b/libs/libaom/src/aom_dsp/mips/loopfilter_4_msa.c
index dc0a97764..dc0a97764 100644
--- a/media/libaom/src/aom_dsp/mips/loopfilter_4_msa.c
+++ b/libs/libaom/src/aom_dsp/mips/loopfilter_4_msa.c
diff --git a/media/libaom/src/aom_dsp/mips/loopfilter_8_msa.c b/libs/libaom/src/aom_dsp/mips/loopfilter_8_msa.c
index dc203e79c..dc203e79c 100644
--- a/media/libaom/src/aom_dsp/mips/loopfilter_8_msa.c
+++ b/libs/libaom/src/aom_dsp/mips/loopfilter_8_msa.c
diff --git a/media/libaom/src/aom_dsp/mips/loopfilter_filters_dspr2.c b/libs/libaom/src/aom_dsp/mips/loopfilter_filters_dspr2.c
index 8c41278be..8c41278be 100644
--- a/media/libaom/src/aom_dsp/mips/loopfilter_filters_dspr2.c
+++ b/libs/libaom/src/aom_dsp/mips/loopfilter_filters_dspr2.c
diff --git a/media/libaom/src/aom_dsp/mips/loopfilter_filters_dspr2.h b/libs/libaom/src/aom_dsp/mips/loopfilter_filters_dspr2.h
index 28f0dc35a..28f0dc35a 100644
--- a/media/libaom/src/aom_dsp/mips/loopfilter_filters_dspr2.h
+++ b/libs/libaom/src/aom_dsp/mips/loopfilter_filters_dspr2.h
diff --git a/media/libaom/src/aom_dsp/mips/loopfilter_macros_dspr2.h b/libs/libaom/src/aom_dsp/mips/loopfilter_macros_dspr2.h
index 62295d69d..62295d69d 100644
--- a/media/libaom/src/aom_dsp/mips/loopfilter_macros_dspr2.h
+++ b/libs/libaom/src/aom_dsp/mips/loopfilter_macros_dspr2.h
diff --git a/media/libaom/src/aom_dsp/mips/loopfilter_masks_dspr2.h b/libs/libaom/src/aom_dsp/mips/loopfilter_masks_dspr2.h
index a0f57f386..a0f57f386 100644
--- a/media/libaom/src/aom_dsp/mips/loopfilter_masks_dspr2.h
+++ b/libs/libaom/src/aom_dsp/mips/loopfilter_masks_dspr2.h
diff --git a/media/libaom/src/aom_dsp/mips/loopfilter_mb_dspr2.c b/libs/libaom/src/aom_dsp/mips/loopfilter_mb_dspr2.c
index b67ccfe9d..b67ccfe9d 100644
--- a/media/libaom/src/aom_dsp/mips/loopfilter_mb_dspr2.c
+++ b/libs/libaom/src/aom_dsp/mips/loopfilter_mb_dspr2.c
diff --git a/media/libaom/src/aom_dsp/mips/loopfilter_mb_horiz_dspr2.c b/libs/libaom/src/aom_dsp/mips/loopfilter_mb_horiz_dspr2.c
index 34733e42e..34733e42e 100644
--- a/media/libaom/src/aom_dsp/mips/loopfilter_mb_horiz_dspr2.c
+++ b/libs/libaom/src/aom_dsp/mips/loopfilter_mb_horiz_dspr2.c
diff --git a/media/libaom/src/aom_dsp/mips/loopfilter_mb_vert_dspr2.c b/libs/libaom/src/aom_dsp/mips/loopfilter_mb_vert_dspr2.c
index 3d3f1ec97..3d3f1ec97 100644
--- a/media/libaom/src/aom_dsp/mips/loopfilter_mb_vert_dspr2.c
+++ b/libs/libaom/src/aom_dsp/mips/loopfilter_mb_vert_dspr2.c
diff --git a/media/libaom/src/aom_dsp/mips/loopfilter_msa.h b/libs/libaom/src/aom_dsp/mips/loopfilter_msa.h
index 54b0bb4bd..54b0bb4bd 100644
--- a/media/libaom/src/aom_dsp/mips/loopfilter_msa.h
+++ b/libs/libaom/src/aom_dsp/mips/loopfilter_msa.h
diff --git a/media/libaom/src/aom_dsp/mips/macros_msa.h b/libs/libaom/src/aom_dsp/mips/macros_msa.h
index 9bfc27147..9bfc27147 100644
--- a/media/libaom/src/aom_dsp/mips/macros_msa.h
+++ b/libs/libaom/src/aom_dsp/mips/macros_msa.h
diff --git a/media/libaom/src/aom_dsp/mips/sad_msa.c b/libs/libaom/src/aom_dsp/mips/sad_msa.c
index 58cdd80d9..58cdd80d9 100644
--- a/media/libaom/src/aom_dsp/mips/sad_msa.c
+++ b/libs/libaom/src/aom_dsp/mips/sad_msa.c
diff --git a/media/libaom/src/aom_dsp/mips/sub_pixel_variance_msa.c b/libs/libaom/src/aom_dsp/mips/sub_pixel_variance_msa.c
index 810b6efaa..810b6efaa 100644
--- a/media/libaom/src/aom_dsp/mips/sub_pixel_variance_msa.c
+++ b/libs/libaom/src/aom_dsp/mips/sub_pixel_variance_msa.c
diff --git a/media/libaom/src/aom_dsp/mips/subtract_msa.c b/libs/libaom/src/aom_dsp/mips/subtract_msa.c
index bfed773ac..bfed773ac 100644
--- a/media/libaom/src/aom_dsp/mips/subtract_msa.c
+++ b/libs/libaom/src/aom_dsp/mips/subtract_msa.c
diff --git a/media/libaom/src/aom_dsp/mips/variance_msa.c b/libs/libaom/src/aom_dsp/mips/variance_msa.c
index 065c09ac5..065c09ac5 100644
--- a/media/libaom/src/aom_dsp/mips/variance_msa.c
+++ b/libs/libaom/src/aom_dsp/mips/variance_msa.c
diff --git a/media/libaom/src/aom_dsp/noise_model.c b/libs/libaom/src/aom_dsp/noise_model.c
index c7a0003a8..c7a0003a8 100644
--- a/media/libaom/src/aom_dsp/noise_model.c
+++ b/libs/libaom/src/aom_dsp/noise_model.c
diff --git a/media/libaom/src/aom_dsp/noise_model.h b/libs/libaom/src/aom_dsp/noise_model.h
index 5e7de9bf2..5e7de9bf2 100644
--- a/media/libaom/src/aom_dsp/noise_model.h
+++ b/libs/libaom/src/aom_dsp/noise_model.h
diff --git a/media/libaom/src/aom_dsp/noise_util.c b/libs/libaom/src/aom_dsp/noise_util.c
index 7e7e380c6..7e7e380c6 100644
--- a/media/libaom/src/aom_dsp/noise_util.c
+++ b/libs/libaom/src/aom_dsp/noise_util.c
diff --git a/media/libaom/src/aom_dsp/noise_util.h b/libs/libaom/src/aom_dsp/noise_util.h
index 2284a171a..2284a171a 100644
--- a/media/libaom/src/aom_dsp/noise_util.h
+++ b/libs/libaom/src/aom_dsp/noise_util.h
diff --git a/media/libaom/src/aom_dsp/prob.h b/libs/libaom/src/aom_dsp/prob.h
index ea5e4cb34..ea5e4cb34 100644
--- a/media/libaom/src/aom_dsp/prob.h
+++ b/libs/libaom/src/aom_dsp/prob.h
diff --git a/media/libaom/src/aom_dsp/psnr.c b/libs/libaom/src/aom_dsp/psnr.c
index c66dd52d0..c66dd52d0 100644
--- a/media/libaom/src/aom_dsp/psnr.c
+++ b/libs/libaom/src/aom_dsp/psnr.c
diff --git a/media/libaom/src/aom_dsp/psnr.h b/libs/libaom/src/aom_dsp/psnr.h
index 7f40b8b57..7f40b8b57 100644
--- a/media/libaom/src/aom_dsp/psnr.h
+++ b/libs/libaom/src/aom_dsp/psnr.h
diff --git a/media/libaom/src/aom_dsp/psnrhvs.c b/libs/libaom/src/aom_dsp/psnrhvs.c
index 69a1d99bf..69a1d99bf 100644
--- a/media/libaom/src/aom_dsp/psnrhvs.c
+++ b/libs/libaom/src/aom_dsp/psnrhvs.c
diff --git a/media/libaom/src/aom_dsp/quantize.c b/libs/libaom/src/aom_dsp/quantize.c
index edd4d9648..edd4d9648 100644
--- a/media/libaom/src/aom_dsp/quantize.c
+++ b/libs/libaom/src/aom_dsp/quantize.c
diff --git a/media/libaom/src/aom_dsp/quantize.h b/libs/libaom/src/aom_dsp/quantize.h
index 395631814..395631814 100644
--- a/media/libaom/src/aom_dsp/quantize.h
+++ b/libs/libaom/src/aom_dsp/quantize.h
diff --git a/media/libaom/src/aom_dsp/recenter.h b/libs/libaom/src/aom_dsp/recenter.h
index b3fd41290..b3fd41290 100644
--- a/media/libaom/src/aom_dsp/recenter.h
+++ b/libs/libaom/src/aom_dsp/recenter.h
diff --git a/media/libaom/src/aom_dsp/sad.c b/libs/libaom/src/aom_dsp/sad.c
index 8ddc683d6..8ddc683d6 100644
--- a/media/libaom/src/aom_dsp/sad.c
+++ b/libs/libaom/src/aom_dsp/sad.c
diff --git a/media/libaom/src/aom_dsp/sad_av1.c b/libs/libaom/src/aom_dsp/sad_av1.c
index 467518163..467518163 100644
--- a/media/libaom/src/aom_dsp/sad_av1.c
+++ b/libs/libaom/src/aom_dsp/sad_av1.c
diff --git a/media/libaom/src/aom_dsp/simd/v128_intrinsics.h b/libs/libaom/src/aom_dsp/simd/v128_intrinsics.h
index 218a7a618..218a7a618 100644
--- a/media/libaom/src/aom_dsp/simd/v128_intrinsics.h
+++ b/libs/libaom/src/aom_dsp/simd/v128_intrinsics.h
diff --git a/media/libaom/src/aom_dsp/simd/v128_intrinsics_arm.h b/libs/libaom/src/aom_dsp/simd/v128_intrinsics_arm.h
index 2d497f4c0..2d497f4c0 100644
--- a/media/libaom/src/aom_dsp/simd/v128_intrinsics_arm.h
+++ b/libs/libaom/src/aom_dsp/simd/v128_intrinsics_arm.h
diff --git a/media/libaom/src/aom_dsp/simd/v128_intrinsics_c.h b/libs/libaom/src/aom_dsp/simd/v128_intrinsics_c.h
index 466a41e10..466a41e10 100644
--- a/media/libaom/src/aom_dsp/simd/v128_intrinsics_c.h
+++ b/libs/libaom/src/aom_dsp/simd/v128_intrinsics_c.h
diff --git a/media/libaom/src/aom_dsp/simd/v128_intrinsics_x86.h b/libs/libaom/src/aom_dsp/simd/v128_intrinsics_x86.h
index c404015ef..c404015ef 100644
--- a/media/libaom/src/aom_dsp/simd/v128_intrinsics_x86.h
+++ b/libs/libaom/src/aom_dsp/simd/v128_intrinsics_x86.h
diff --git a/media/libaom/src/aom_dsp/simd/v256_intrinsics.h b/libs/libaom/src/aom_dsp/simd/v256_intrinsics.h
index 17e36eed6..17e36eed6 100644
--- a/media/libaom/src/aom_dsp/simd/v256_intrinsics.h
+++ b/libs/libaom/src/aom_dsp/simd/v256_intrinsics.h
diff --git a/media/libaom/src/aom_dsp/simd/v256_intrinsics_arm.h b/libs/libaom/src/aom_dsp/simd/v256_intrinsics_arm.h
index bd86ea172..bd86ea172 100644
--- a/media/libaom/src/aom_dsp/simd/v256_intrinsics_arm.h
+++ b/libs/libaom/src/aom_dsp/simd/v256_intrinsics_arm.h
diff --git a/media/libaom/src/aom_dsp/simd/v256_intrinsics_c.h b/libs/libaom/src/aom_dsp/simd/v256_intrinsics_c.h
index 8127ee356..8127ee356 100644
--- a/media/libaom/src/aom_dsp/simd/v256_intrinsics_c.h
+++ b/libs/libaom/src/aom_dsp/simd/v256_intrinsics_c.h
diff --git a/media/libaom/src/aom_dsp/simd/v256_intrinsics_v128.h b/libs/libaom/src/aom_dsp/simd/v256_intrinsics_v128.h
index 0d2266754..0d2266754 100644
--- a/media/libaom/src/aom_dsp/simd/v256_intrinsics_v128.h
+++ b/libs/libaom/src/aom_dsp/simd/v256_intrinsics_v128.h
diff --git a/media/libaom/src/aom_dsp/simd/v256_intrinsics_x86.h b/libs/libaom/src/aom_dsp/simd/v256_intrinsics_x86.h
index 5983cb80c..5983cb80c 100644
--- a/media/libaom/src/aom_dsp/simd/v256_intrinsics_x86.h
+++ b/libs/libaom/src/aom_dsp/simd/v256_intrinsics_x86.h
diff --git a/media/libaom/src/aom_dsp/simd/v64_intrinsics.h b/libs/libaom/src/aom_dsp/simd/v64_intrinsics.h
index 7079949cd..7079949cd 100644
--- a/media/libaom/src/aom_dsp/simd/v64_intrinsics.h
+++ b/libs/libaom/src/aom_dsp/simd/v64_intrinsics.h
diff --git a/media/libaom/src/aom_dsp/simd/v64_intrinsics_arm.h b/libs/libaom/src/aom_dsp/simd/v64_intrinsics_arm.h
index a4ecdf4b5..a4ecdf4b5 100644
--- a/media/libaom/src/aom_dsp/simd/v64_intrinsics_arm.h
+++ b/libs/libaom/src/aom_dsp/simd/v64_intrinsics_arm.h
diff --git a/media/libaom/src/aom_dsp/simd/v64_intrinsics_c.h b/libs/libaom/src/aom_dsp/simd/v64_intrinsics_c.h
index b84f243c4..b84f243c4 100644
--- a/media/libaom/src/aom_dsp/simd/v64_intrinsics_c.h
+++ b/libs/libaom/src/aom_dsp/simd/v64_intrinsics_c.h
diff --git a/media/libaom/src/aom_dsp/simd/v64_intrinsics_x86.h b/libs/libaom/src/aom_dsp/simd/v64_intrinsics_x86.h
index 1f273fe96..1f273fe96 100644
--- a/media/libaom/src/aom_dsp/simd/v64_intrinsics_x86.h
+++ b/libs/libaom/src/aom_dsp/simd/v64_intrinsics_x86.h
diff --git a/media/libaom/src/aom_dsp/sse.c b/libs/libaom/src/aom_dsp/sse.c
index 16f6b58bd..16f6b58bd 100644
--- a/media/libaom/src/aom_dsp/sse.c
+++ b/libs/libaom/src/aom_dsp/sse.c
diff --git a/media/libaom/src/aom_dsp/ssim.c b/libs/libaom/src/aom_dsp/ssim.c
index 95b88887b..95b88887b 100644
--- a/media/libaom/src/aom_dsp/ssim.c
+++ b/libs/libaom/src/aom_dsp/ssim.c
diff --git a/media/libaom/src/aom_dsp/ssim.h b/libs/libaom/src/aom_dsp/ssim.h
index 55038f4c2..55038f4c2 100644
--- a/media/libaom/src/aom_dsp/ssim.h
+++ b/libs/libaom/src/aom_dsp/ssim.h
diff --git a/media/libaom/src/aom_dsp/subtract.c b/libs/libaom/src/aom_dsp/subtract.c
index 4f4e35597..4f4e35597 100644
--- a/media/libaom/src/aom_dsp/subtract.c
+++ b/libs/libaom/src/aom_dsp/subtract.c
diff --git a/media/libaom/src/aom_dsp/sum_squares.c b/libs/libaom/src/aom_dsp/sum_squares.c
index d739a6083..d739a6083 100644
--- a/media/libaom/src/aom_dsp/sum_squares.c
+++ b/libs/libaom/src/aom_dsp/sum_squares.c
diff --git a/media/libaom/src/aom_dsp/txfm_common.h b/libs/libaom/src/aom_dsp/txfm_common.h
index f13d69092..f13d69092 100644
--- a/media/libaom/src/aom_dsp/txfm_common.h
+++ b/libs/libaom/src/aom_dsp/txfm_common.h
diff --git a/media/libaom/src/aom_dsp/variance.c b/libs/libaom/src/aom_dsp/variance.c
index 695f12a52..695f12a52 100644
--- a/media/libaom/src/aom_dsp/variance.c
+++ b/libs/libaom/src/aom_dsp/variance.c
diff --git a/media/libaom/src/aom_dsp/variance.h b/libs/libaom/src/aom_dsp/variance.h
index 4550c17b3..4550c17b3 100644
--- a/media/libaom/src/aom_dsp/variance.h
+++ b/libs/libaom/src/aom_dsp/variance.h
diff --git a/media/libaom/src/aom_dsp/vmaf.c b/libs/libaom/src/aom_dsp/vmaf.c
index 3a012e768..3a012e768 100644
--- a/media/libaom/src/aom_dsp/vmaf.c
+++ b/libs/libaom/src/aom_dsp/vmaf.c
diff --git a/media/libaom/src/aom_dsp/vmaf.h b/libs/libaom/src/aom_dsp/vmaf.h
index fb8bf4613..fb8bf4613 100644
--- a/media/libaom/src/aom_dsp/vmaf.h
+++ b/libs/libaom/src/aom_dsp/vmaf.h
diff --git a/media/libaom/src/aom_dsp/x86/adaptive_quantize_avx2.c b/libs/libaom/src/aom_dsp/x86/adaptive_quantize_avx2.c
index e33dff20c..e33dff20c 100644
--- a/media/libaom/src/aom_dsp/x86/adaptive_quantize_avx2.c
+++ b/libs/libaom/src/aom_dsp/x86/adaptive_quantize_avx2.c
diff --git a/media/libaom/src/aom_dsp/x86/adaptive_quantize_sse2.c b/libs/libaom/src/aom_dsp/x86/adaptive_quantize_sse2.c
index 584cd671f..584cd671f 100644
--- a/media/libaom/src/aom_dsp/x86/adaptive_quantize_sse2.c
+++ b/libs/libaom/src/aom_dsp/x86/adaptive_quantize_sse2.c
diff --git a/media/libaom/src/aom_dsp/x86/aom_asm_stubs.c b/libs/libaom/src/aom_dsp/x86/aom_asm_stubs.c
index ce8285e43..ce8285e43 100644
--- a/media/libaom/src/aom_dsp/x86/aom_asm_stubs.c
+++ b/libs/libaom/src/aom_dsp/x86/aom_asm_stubs.c
diff --git a/media/libaom/src/aom_dsp/x86/aom_convolve_copy_sse2.asm b/libs/libaom/src/aom_dsp/x86/aom_convolve_copy_sse2.asm
index 7283c32b8..7283c32b8 100644
--- a/media/libaom/src/aom_dsp/x86/aom_convolve_copy_sse2.asm
+++ b/libs/libaom/src/aom_dsp/x86/aom_convolve_copy_sse2.asm
diff --git a/media/libaom/src/aom_dsp/x86/aom_high_subpixel_8t_sse2.asm b/libs/libaom/src/aom_dsp/x86/aom_high_subpixel_8t_sse2.asm
index b6f040791..b6f040791 100644
--- a/media/libaom/src/aom_dsp/x86/aom_high_subpixel_8t_sse2.asm
+++ b/libs/libaom/src/aom_dsp/x86/aom_high_subpixel_8t_sse2.asm
diff --git a/media/libaom/src/aom_dsp/x86/aom_high_subpixel_bilinear_sse2.asm b/libs/libaom/src/aom_dsp/x86/aom_high_subpixel_bilinear_sse2.asm
index a7152be57..a7152be57 100644
--- a/media/libaom/src/aom_dsp/x86/aom_high_subpixel_bilinear_sse2.asm
+++ b/libs/libaom/src/aom_dsp/x86/aom_high_subpixel_bilinear_sse2.asm
diff --git a/media/libaom/src/aom_dsp/x86/aom_subpixel_8t_intrin_avx2.c b/libs/libaom/src/aom_dsp/x86/aom_subpixel_8t_intrin_avx2.c
index 94b5da171..94b5da171 100644
--- a/media/libaom/src/aom_dsp/x86/aom_subpixel_8t_intrin_avx2.c
+++ b/libs/libaom/src/aom_dsp/x86/aom_subpixel_8t_intrin_avx2.c
diff --git a/media/libaom/src/aom_dsp/x86/aom_subpixel_8t_intrin_sse2.c b/libs/libaom/src/aom_dsp/x86/aom_subpixel_8t_intrin_sse2.c
index cff7f43ee..cff7f43ee 100644
--- a/media/libaom/src/aom_dsp/x86/aom_subpixel_8t_intrin_sse2.c
+++ b/libs/libaom/src/aom_dsp/x86/aom_subpixel_8t_intrin_sse2.c
diff --git a/media/libaom/src/aom_dsp/x86/aom_subpixel_8t_intrin_ssse3.c b/libs/libaom/src/aom_dsp/x86/aom_subpixel_8t_intrin_ssse3.c
index f64b821ea..f64b821ea 100644
--- a/media/libaom/src/aom_dsp/x86/aom_subpixel_8t_intrin_ssse3.c
+++ b/libs/libaom/src/aom_dsp/x86/aom_subpixel_8t_intrin_ssse3.c
diff --git a/media/libaom/src/aom_dsp/x86/aom_subpixel_8t_sse2.asm b/libs/libaom/src/aom_dsp/x86/aom_subpixel_8t_sse2.asm
index c88fc9ffb..c88fc9ffb 100644
--- a/media/libaom/src/aom_dsp/x86/aom_subpixel_8t_sse2.asm
+++ b/libs/libaom/src/aom_dsp/x86/aom_subpixel_8t_sse2.asm
diff --git a/media/libaom/src/aom_dsp/x86/aom_subpixel_8t_ssse3.asm b/libs/libaom/src/aom_dsp/x86/aom_subpixel_8t_ssse3.asm
index 3ca7921b6..3ca7921b6 100644
--- a/media/libaom/src/aom_dsp/x86/aom_subpixel_8t_ssse3.asm
+++ b/libs/libaom/src/aom_dsp/x86/aom_subpixel_8t_ssse3.asm
diff --git a/media/libaom/src/aom_dsp/x86/aom_subpixel_bilinear_sse2.asm b/libs/libaom/src/aom_dsp/x86/aom_subpixel_bilinear_sse2.asm
index d0b4b2839..d0b4b2839 100644
--- a/media/libaom/src/aom_dsp/x86/aom_subpixel_bilinear_sse2.asm
+++ b/libs/libaom/src/aom_dsp/x86/aom_subpixel_bilinear_sse2.asm
diff --git a/media/libaom/src/aom_dsp/x86/aom_subpixel_bilinear_ssse3.asm b/libs/libaom/src/aom_dsp/x86/aom_subpixel_bilinear_ssse3.asm
index 59edc49a9..59edc49a9 100644
--- a/media/libaom/src/aom_dsp/x86/aom_subpixel_bilinear_ssse3.asm
+++ b/libs/libaom/src/aom_dsp/x86/aom_subpixel_bilinear_ssse3.asm
diff --git a/media/libaom/src/aom_dsp/x86/avg_intrin_avx2.c b/libs/libaom/src/aom_dsp/x86/avg_intrin_avx2.c
index 3bbffbd80..3bbffbd80 100644
--- a/media/libaom/src/aom_dsp/x86/avg_intrin_avx2.c
+++ b/libs/libaom/src/aom_dsp/x86/avg_intrin_avx2.c
diff --git a/media/libaom/src/aom_dsp/x86/avg_intrin_sse2.c b/libs/libaom/src/aom_dsp/x86/avg_intrin_sse2.c
index 260ca2ad1..260ca2ad1 100644
--- a/media/libaom/src/aom_dsp/x86/avg_intrin_sse2.c
+++ b/libs/libaom/src/aom_dsp/x86/avg_intrin_sse2.c
diff --git a/media/libaom/src/aom_dsp/x86/bitdepth_conversion_avx2.h b/libs/libaom/src/aom_dsp/x86/bitdepth_conversion_avx2.h
index 85896e276..85896e276 100644
--- a/media/libaom/src/aom_dsp/x86/bitdepth_conversion_avx2.h
+++ b/libs/libaom/src/aom_dsp/x86/bitdepth_conversion_avx2.h
diff --git a/media/libaom/src/aom_dsp/x86/bitdepth_conversion_sse2.h b/libs/libaom/src/aom_dsp/x86/bitdepth_conversion_sse2.h
index 42bb2d1d3..42bb2d1d3 100644
--- a/media/libaom/src/aom_dsp/x86/bitdepth_conversion_sse2.h
+++ b/libs/libaom/src/aom_dsp/x86/bitdepth_conversion_sse2.h
diff --git a/media/libaom/src/aom_dsp/x86/blend_a64_hmask_sse4.c b/libs/libaom/src/aom_dsp/x86/blend_a64_hmask_sse4.c
index e0289abe1..e0289abe1 100644
--- a/media/libaom/src/aom_dsp/x86/blend_a64_hmask_sse4.c
+++ b/libs/libaom/src/aom_dsp/x86/blend_a64_hmask_sse4.c
diff --git a/media/libaom/src/aom_dsp/x86/blend_a64_mask_avx2.c b/libs/libaom/src/aom_dsp/x86/blend_a64_mask_avx2.c
index 95383d2fd..95383d2fd 100644
--- a/media/libaom/src/aom_dsp/x86/blend_a64_mask_avx2.c
+++ b/libs/libaom/src/aom_dsp/x86/blend_a64_mask_avx2.c
diff --git a/media/libaom/src/aom_dsp/x86/blend_a64_mask_sse4.c b/libs/libaom/src/aom_dsp/x86/blend_a64_mask_sse4.c
index 4a368ef94..4a368ef94 100644
--- a/media/libaom/src/aom_dsp/x86/blend_a64_mask_sse4.c
+++ b/libs/libaom/src/aom_dsp/x86/blend_a64_mask_sse4.c
diff --git a/media/libaom/src/aom_dsp/x86/blend_a64_vmask_sse4.c b/libs/libaom/src/aom_dsp/x86/blend_a64_vmask_sse4.c
index 75fb1c5a9..75fb1c5a9 100644
--- a/media/libaom/src/aom_dsp/x86/blend_a64_vmask_sse4.c
+++ b/libs/libaom/src/aom_dsp/x86/blend_a64_vmask_sse4.c
diff --git a/media/libaom/src/aom_dsp/x86/blend_mask_sse4.h b/libs/libaom/src/aom_dsp/x86/blend_mask_sse4.h
index c071fdcfc..c071fdcfc 100644
--- a/media/libaom/src/aom_dsp/x86/blend_mask_sse4.h
+++ b/libs/libaom/src/aom_dsp/x86/blend_mask_sse4.h
diff --git a/media/libaom/src/aom_dsp/x86/blend_sse4.h b/libs/libaom/src/aom_dsp/x86/blend_sse4.h
index 8d9b32510..8d9b32510 100644
--- a/media/libaom/src/aom_dsp/x86/blend_sse4.h
+++ b/libs/libaom/src/aom_dsp/x86/blend_sse4.h
diff --git a/media/libaom/src/aom_dsp/x86/blk_sse_sum_avx2.c b/libs/libaom/src/aom_dsp/x86/blk_sse_sum_avx2.c
index f7c0eb037..f7c0eb037 100644
--- a/media/libaom/src/aom_dsp/x86/blk_sse_sum_avx2.c
+++ b/libs/libaom/src/aom_dsp/x86/blk_sse_sum_avx2.c
diff --git a/media/libaom/src/aom_dsp/x86/blk_sse_sum_sse2.c b/libs/libaom/src/aom_dsp/x86/blk_sse_sum_sse2.c
index ef0a024ee..ef0a024ee 100644
--- a/media/libaom/src/aom_dsp/x86/blk_sse_sum_sse2.c
+++ b/libs/libaom/src/aom_dsp/x86/blk_sse_sum_sse2.c
diff --git a/media/libaom/src/aom_dsp/x86/common_avx2.h b/libs/libaom/src/aom_dsp/x86/common_avx2.h
index 96fe4ebb6..96fe4ebb6 100644
--- a/media/libaom/src/aom_dsp/x86/common_avx2.h
+++ b/libs/libaom/src/aom_dsp/x86/common_avx2.h
diff --git a/media/libaom/src/aom_dsp/x86/convolve.h b/libs/libaom/src/aom_dsp/x86/convolve.h
index b4ff6975c..b4ff6975c 100644
--- a/media/libaom/src/aom_dsp/x86/convolve.h
+++ b/libs/libaom/src/aom_dsp/x86/convolve.h
diff --git a/media/libaom/src/aom_dsp/x86/convolve_avx2.h b/libs/libaom/src/aom_dsp/x86/convolve_avx2.h
index d516de5f2..d516de5f2 100644
--- a/media/libaom/src/aom_dsp/x86/convolve_avx2.h
+++ b/libs/libaom/src/aom_dsp/x86/convolve_avx2.h
diff --git a/media/libaom/src/aom_dsp/x86/convolve_common_intrin.h b/libs/libaom/src/aom_dsp/x86/convolve_common_intrin.h
index 707bd2d78..707bd2d78 100644
--- a/media/libaom/src/aom_dsp/x86/convolve_common_intrin.h
+++ b/libs/libaom/src/aom_dsp/x86/convolve_common_intrin.h
diff --git a/media/libaom/src/aom_dsp/x86/convolve_sse2.h b/libs/libaom/src/aom_dsp/x86/convolve_sse2.h
index 385c7c7e1..385c7c7e1 100644
--- a/media/libaom/src/aom_dsp/x86/convolve_sse2.h
+++ b/libs/libaom/src/aom_dsp/x86/convolve_sse2.h
diff --git a/media/libaom/src/aom_dsp/x86/convolve_sse4_1.h b/libs/libaom/src/aom_dsp/x86/convolve_sse4_1.h
index b1a3bb466..b1a3bb466 100644
--- a/media/libaom/src/aom_dsp/x86/convolve_sse4_1.h
+++ b/libs/libaom/src/aom_dsp/x86/convolve_sse4_1.h
diff --git a/media/libaom/src/aom_dsp/x86/fft_avx2.c b/libs/libaom/src/aom_dsp/x86/fft_avx2.c
index 4cccc5f00..4cccc5f00 100644
--- a/media/libaom/src/aom_dsp/x86/fft_avx2.c
+++ b/libs/libaom/src/aom_dsp/x86/fft_avx2.c
diff --git a/media/libaom/src/aom_dsp/x86/fft_sse2.c b/libs/libaom/src/aom_dsp/x86/fft_sse2.c
index 6f20a3cc0..6f20a3cc0 100644
--- a/media/libaom/src/aom_dsp/x86/fft_sse2.c
+++ b/libs/libaom/src/aom_dsp/x86/fft_sse2.c
diff --git a/media/libaom/src/aom_dsp/x86/fwd_txfm_impl_sse2.h b/libs/libaom/src/aom_dsp/x86/fwd_txfm_impl_sse2.h
index 89fe1899b..89fe1899b 100644
--- a/media/libaom/src/aom_dsp/x86/fwd_txfm_impl_sse2.h
+++ b/libs/libaom/src/aom_dsp/x86/fwd_txfm_impl_sse2.h
diff --git a/media/libaom/src/aom_dsp/x86/fwd_txfm_sse2.c b/libs/libaom/src/aom_dsp/x86/fwd_txfm_sse2.c
index 0e4fb8046..0e4fb8046 100644
--- a/media/libaom/src/aom_dsp/x86/fwd_txfm_sse2.c
+++ b/libs/libaom/src/aom_dsp/x86/fwd_txfm_sse2.c
diff --git a/media/libaom/src/aom_dsp/x86/fwd_txfm_sse2.h b/libs/libaom/src/aom_dsp/x86/fwd_txfm_sse2.h
index ab3cd9155..ab3cd9155 100644
--- a/media/libaom/src/aom_dsp/x86/fwd_txfm_sse2.h
+++ b/libs/libaom/src/aom_dsp/x86/fwd_txfm_sse2.h
diff --git a/media/libaom/src/aom_dsp/x86/fwd_txfm_ssse3_x86_64.asm b/libs/libaom/src/aom_dsp/x86/fwd_txfm_ssse3_x86_64.asm
index c1fb259a1..c1fb259a1 100644
--- a/media/libaom/src/aom_dsp/x86/fwd_txfm_ssse3_x86_64.asm
+++ b/libs/libaom/src/aom_dsp/x86/fwd_txfm_ssse3_x86_64.asm
diff --git a/media/libaom/src/aom_dsp/x86/highbd_adaptive_quantize_avx2.c b/libs/libaom/src/aom_dsp/x86/highbd_adaptive_quantize_avx2.c
index c500b0a26..c500b0a26 100644
--- a/media/libaom/src/aom_dsp/x86/highbd_adaptive_quantize_avx2.c
+++ b/libs/libaom/src/aom_dsp/x86/highbd_adaptive_quantize_avx2.c
diff --git a/media/libaom/src/aom_dsp/x86/highbd_adaptive_quantize_sse2.c b/libs/libaom/src/aom_dsp/x86/highbd_adaptive_quantize_sse2.c
index 8f31f3596..8f31f3596 100644
--- a/media/libaom/src/aom_dsp/x86/highbd_adaptive_quantize_sse2.c
+++ b/libs/libaom/src/aom_dsp/x86/highbd_adaptive_quantize_sse2.c
diff --git a/media/libaom/src/aom_dsp/x86/highbd_convolve_avx2.c b/libs/libaom/src/aom_dsp/x86/highbd_convolve_avx2.c
index b43a7d7b5..b43a7d7b5 100644
--- a/media/libaom/src/aom_dsp/x86/highbd_convolve_avx2.c
+++ b/libs/libaom/src/aom_dsp/x86/highbd_convolve_avx2.c
diff --git a/media/libaom/src/aom_dsp/x86/highbd_convolve_sse2.c b/libs/libaom/src/aom_dsp/x86/highbd_convolve_sse2.c
index a2bb28322..a2bb28322 100644
--- a/media/libaom/src/aom_dsp/x86/highbd_convolve_sse2.c
+++ b/libs/libaom/src/aom_dsp/x86/highbd_convolve_sse2.c
diff --git a/media/libaom/src/aom_dsp/x86/highbd_convolve_ssse3.c b/libs/libaom/src/aom_dsp/x86/highbd_convolve_ssse3.c
index a79350f5a..a79350f5a 100644
--- a/media/libaom/src/aom_dsp/x86/highbd_convolve_ssse3.c
+++ b/libs/libaom/src/aom_dsp/x86/highbd_convolve_ssse3.c
diff --git a/media/libaom/src/aom_dsp/x86/highbd_intrapred_asm_sse2.asm b/libs/libaom/src/aom_dsp/x86/highbd_intrapred_asm_sse2.asm
index 91b3d126c..91b3d126c 100644
--- a/media/libaom/src/aom_dsp/x86/highbd_intrapred_asm_sse2.asm
+++ b/libs/libaom/src/aom_dsp/x86/highbd_intrapred_asm_sse2.asm
diff --git a/media/libaom/src/aom_dsp/x86/highbd_intrapred_sse2.c b/libs/libaom/src/aom_dsp/x86/highbd_intrapred_sse2.c
index 5a55736c4..5a55736c4 100644
--- a/media/libaom/src/aom_dsp/x86/highbd_intrapred_sse2.c
+++ b/libs/libaom/src/aom_dsp/x86/highbd_intrapred_sse2.c
diff --git a/media/libaom/src/aom_dsp/x86/highbd_loopfilter_avx2.c b/libs/libaom/src/aom_dsp/x86/highbd_loopfilter_avx2.c
index c954da94e..c954da94e 100644
--- a/media/libaom/src/aom_dsp/x86/highbd_loopfilter_avx2.c
+++ b/libs/libaom/src/aom_dsp/x86/highbd_loopfilter_avx2.c
diff --git a/media/libaom/src/aom_dsp/x86/highbd_loopfilter_sse2.c b/libs/libaom/src/aom_dsp/x86/highbd_loopfilter_sse2.c
index ea7dc6a9e..ea7dc6a9e 100644
--- a/media/libaom/src/aom_dsp/x86/highbd_loopfilter_sse2.c
+++ b/libs/libaom/src/aom_dsp/x86/highbd_loopfilter_sse2.c
diff --git a/media/libaom/src/aom_dsp/x86/highbd_quantize_intrin_avx2.c b/libs/libaom/src/aom_dsp/x86/highbd_quantize_intrin_avx2.c
index b9689202a..b9689202a 100644
--- a/media/libaom/src/aom_dsp/x86/highbd_quantize_intrin_avx2.c
+++ b/libs/libaom/src/aom_dsp/x86/highbd_quantize_intrin_avx2.c
diff --git a/media/libaom/src/aom_dsp/x86/highbd_quantize_intrin_sse2.c b/libs/libaom/src/aom_dsp/x86/highbd_quantize_intrin_sse2.c
index 1764a4952..1764a4952 100644
--- a/media/libaom/src/aom_dsp/x86/highbd_quantize_intrin_sse2.c
+++ b/libs/libaom/src/aom_dsp/x86/highbd_quantize_intrin_sse2.c
diff --git a/media/libaom/src/aom_dsp/x86/highbd_sad4d_sse2.asm b/libs/libaom/src/aom_dsp/x86/highbd_sad4d_sse2.asm
index e0d22522d..e0d22522d 100644
--- a/media/libaom/src/aom_dsp/x86/highbd_sad4d_sse2.asm
+++ b/libs/libaom/src/aom_dsp/x86/highbd_sad4d_sse2.asm
diff --git a/media/libaom/src/aom_dsp/x86/highbd_sad_sse2.asm b/libs/libaom/src/aom_dsp/x86/highbd_sad_sse2.asm
index 09e64d510..09e64d510 100644
--- a/media/libaom/src/aom_dsp/x86/highbd_sad_sse2.asm
+++ b/libs/libaom/src/aom_dsp/x86/highbd_sad_sse2.asm
diff --git a/media/libaom/src/aom_dsp/x86/highbd_subpel_variance_impl_sse2.asm b/libs/libaom/src/aom_dsp/x86/highbd_subpel_variance_impl_sse2.asm
index 5c78933df..5c78933df 100644
--- a/media/libaom/src/aom_dsp/x86/highbd_subpel_variance_impl_sse2.asm
+++ b/libs/libaom/src/aom_dsp/x86/highbd_subpel_variance_impl_sse2.asm
diff --git a/media/libaom/src/aom_dsp/x86/highbd_subtract_sse2.c b/libs/libaom/src/aom_dsp/x86/highbd_subtract_sse2.c
index b72d1cf8b..b72d1cf8b 100644
--- a/media/libaom/src/aom_dsp/x86/highbd_subtract_sse2.c
+++ b/libs/libaom/src/aom_dsp/x86/highbd_subtract_sse2.c
diff --git a/media/libaom/src/aom_dsp/x86/highbd_variance_avx2.c b/libs/libaom/src/aom_dsp/x86/highbd_variance_avx2.c
index 9b1b4c9de..9b1b4c9de 100644
--- a/media/libaom/src/aom_dsp/x86/highbd_variance_avx2.c
+++ b/libs/libaom/src/aom_dsp/x86/highbd_variance_avx2.c
diff --git a/media/libaom/src/aom_dsp/x86/highbd_variance_impl_sse2.asm b/libs/libaom/src/aom_dsp/x86/highbd_variance_impl_sse2.asm
index 0d954e178..0d954e178 100644
--- a/media/libaom/src/aom_dsp/x86/highbd_variance_impl_sse2.asm
+++ b/libs/libaom/src/aom_dsp/x86/highbd_variance_impl_sse2.asm
diff --git a/media/libaom/src/aom_dsp/x86/highbd_variance_sse2.c b/libs/libaom/src/aom_dsp/x86/highbd_variance_sse2.c
index b7d15f93e..b7d15f93e 100644
--- a/media/libaom/src/aom_dsp/x86/highbd_variance_sse2.c
+++ b/libs/libaom/src/aom_dsp/x86/highbd_variance_sse2.c
diff --git a/media/libaom/src/aom_dsp/x86/highbd_variance_sse4.c b/libs/libaom/src/aom_dsp/x86/highbd_variance_sse4.c
index df5449a9d..df5449a9d 100644
--- a/media/libaom/src/aom_dsp/x86/highbd_variance_sse4.c
+++ b/libs/libaom/src/aom_dsp/x86/highbd_variance_sse4.c
diff --git a/media/libaom/src/aom_dsp/x86/intrapred_asm_sse2.asm b/libs/libaom/src/aom_dsp/x86/intrapred_asm_sse2.asm
index 0eb632326..0eb632326 100644
--- a/media/libaom/src/aom_dsp/x86/intrapred_asm_sse2.asm
+++ b/libs/libaom/src/aom_dsp/x86/intrapred_asm_sse2.asm
diff --git a/media/libaom/src/aom_dsp/x86/intrapred_avx2.c b/libs/libaom/src/aom_dsp/x86/intrapred_avx2.c
index 546ee74bb..546ee74bb 100644
--- a/media/libaom/src/aom_dsp/x86/intrapred_avx2.c
+++ b/libs/libaom/src/aom_dsp/x86/intrapred_avx2.c
diff --git a/media/libaom/src/aom_dsp/x86/intrapred_sse2.c b/libs/libaom/src/aom_dsp/x86/intrapred_sse2.c
index 5afef68c3..5afef68c3 100644
--- a/media/libaom/src/aom_dsp/x86/intrapred_sse2.c
+++ b/libs/libaom/src/aom_dsp/x86/intrapred_sse2.c
diff --git a/media/libaom/src/aom_dsp/x86/intrapred_ssse3.c b/libs/libaom/src/aom_dsp/x86/intrapred_ssse3.c
index 5a34ea0c8..5a34ea0c8 100644
--- a/media/libaom/src/aom_dsp/x86/intrapred_ssse3.c
+++ b/libs/libaom/src/aom_dsp/x86/intrapred_ssse3.c
diff --git a/media/libaom/src/aom_dsp/x86/intrapred_x86.h b/libs/libaom/src/aom_dsp/x86/intrapred_x86.h
index b13f575a7..b13f575a7 100644
--- a/media/libaom/src/aom_dsp/x86/intrapred_x86.h
+++ b/libs/libaom/src/aom_dsp/x86/intrapred_x86.h
diff --git a/media/libaom/src/aom_dsp/x86/inv_wht_sse2.asm b/libs/libaom/src/aom_dsp/x86/inv_wht_sse2.asm
index 0bc841a7a..0bc841a7a 100644
--- a/media/libaom/src/aom_dsp/x86/inv_wht_sse2.asm
+++ b/libs/libaom/src/aom_dsp/x86/inv_wht_sse2.asm
diff --git a/media/libaom/src/aom_dsp/x86/jnt_sad_ssse3.c b/libs/libaom/src/aom_dsp/x86/jnt_sad_ssse3.c
index 2e3e2be10..2e3e2be10 100644
--- a/media/libaom/src/aom_dsp/x86/jnt_sad_ssse3.c
+++ b/libs/libaom/src/aom_dsp/x86/jnt_sad_ssse3.c
diff --git a/media/libaom/src/aom_dsp/x86/jnt_variance_ssse3.c b/libs/libaom/src/aom_dsp/x86/jnt_variance_ssse3.c
index c8b02f556..c8b02f556 100644
--- a/media/libaom/src/aom_dsp/x86/jnt_variance_ssse3.c
+++ b/libs/libaom/src/aom_dsp/x86/jnt_variance_ssse3.c
diff --git a/media/libaom/src/aom_dsp/x86/loopfilter_sse2.c b/libs/libaom/src/aom_dsp/x86/loopfilter_sse2.c
index d534683fc..d534683fc 100644
--- a/media/libaom/src/aom_dsp/x86/loopfilter_sse2.c
+++ b/libs/libaom/src/aom_dsp/x86/loopfilter_sse2.c
diff --git a/media/libaom/src/aom_dsp/x86/lpf_common_sse2.h b/libs/libaom/src/aom_dsp/x86/lpf_common_sse2.h
index 6ed2cbfdf..6ed2cbfdf 100644
--- a/media/libaom/src/aom_dsp/x86/lpf_common_sse2.h
+++ b/libs/libaom/src/aom_dsp/x86/lpf_common_sse2.h
diff --git a/media/libaom/src/aom_dsp/x86/masked_sad4d_ssse3.c b/libs/libaom/src/aom_dsp/x86/masked_sad4d_ssse3.c
index 8ef7ee0d7..8ef7ee0d7 100644
--- a/media/libaom/src/aom_dsp/x86/masked_sad4d_ssse3.c
+++ b/libs/libaom/src/aom_dsp/x86/masked_sad4d_ssse3.c
diff --git a/media/libaom/src/aom_dsp/x86/masked_sad_intrin_avx2.c b/libs/libaom/src/aom_dsp/x86/masked_sad_intrin_avx2.c
index 60f0ab339..60f0ab339 100644
--- a/media/libaom/src/aom_dsp/x86/masked_sad_intrin_avx2.c
+++ b/libs/libaom/src/aom_dsp/x86/masked_sad_intrin_avx2.c
diff --git a/media/libaom/src/aom_dsp/x86/masked_sad_intrin_ssse3.c b/libs/libaom/src/aom_dsp/x86/masked_sad_intrin_ssse3.c
index 716827796..716827796 100644
--- a/media/libaom/src/aom_dsp/x86/masked_sad_intrin_ssse3.c
+++ b/libs/libaom/src/aom_dsp/x86/masked_sad_intrin_ssse3.c
diff --git a/media/libaom/src/aom_dsp/x86/masked_sad_intrin_ssse3.h b/libs/libaom/src/aom_dsp/x86/masked_sad_intrin_ssse3.h
index cffbd9672..cffbd9672 100644
--- a/media/libaom/src/aom_dsp/x86/masked_sad_intrin_ssse3.h
+++ b/libs/libaom/src/aom_dsp/x86/masked_sad_intrin_ssse3.h
diff --git a/media/libaom/src/aom_dsp/x86/masked_variance_intrin_ssse3.c b/libs/libaom/src/aom_dsp/x86/masked_variance_intrin_ssse3.c
index fa93f0df4..fa93f0df4 100644
--- a/media/libaom/src/aom_dsp/x86/masked_variance_intrin_ssse3.c
+++ b/libs/libaom/src/aom_dsp/x86/masked_variance_intrin_ssse3.c
diff --git a/media/libaom/src/aom_dsp/x86/masked_variance_intrin_ssse3.h b/libs/libaom/src/aom_dsp/x86/masked_variance_intrin_ssse3.h
index 4faa098ac..4faa098ac 100644
--- a/media/libaom/src/aom_dsp/x86/masked_variance_intrin_ssse3.h
+++ b/libs/libaom/src/aom_dsp/x86/masked_variance_intrin_ssse3.h
diff --git a/media/libaom/src/aom_dsp/x86/mem_sse2.h b/libs/libaom/src/aom_dsp/x86/mem_sse2.h
index 6c821673e..6c821673e 100644
--- a/media/libaom/src/aom_dsp/x86/mem_sse2.h
+++ b/libs/libaom/src/aom_dsp/x86/mem_sse2.h
diff --git a/media/libaom/src/aom_dsp/x86/obmc_intrinsic_sse4.h b/libs/libaom/src/aom_dsp/x86/obmc_intrinsic_sse4.h
index 5181e444c..5181e444c 100644
--- a/media/libaom/src/aom_dsp/x86/obmc_intrinsic_sse4.h
+++ b/libs/libaom/src/aom_dsp/x86/obmc_intrinsic_sse4.h
diff --git a/media/libaom/src/aom_dsp/x86/obmc_intrinsic_ssse3.h b/libs/libaom/src/aom_dsp/x86/obmc_intrinsic_ssse3.h
index 48486c6c4..48486c6c4 100644
--- a/media/libaom/src/aom_dsp/x86/obmc_intrinsic_ssse3.h
+++ b/libs/libaom/src/aom_dsp/x86/obmc_intrinsic_ssse3.h
diff --git a/media/libaom/src/aom_dsp/x86/obmc_sad_avx2.c b/libs/libaom/src/aom_dsp/x86/obmc_sad_avx2.c
index 2aa2a0555..2aa2a0555 100644
--- a/media/libaom/src/aom_dsp/x86/obmc_sad_avx2.c
+++ b/libs/libaom/src/aom_dsp/x86/obmc_sad_avx2.c
diff --git a/media/libaom/src/aom_dsp/x86/obmc_sad_sse4.c b/libs/libaom/src/aom_dsp/x86/obmc_sad_sse4.c
index 0338a8c77..0338a8c77 100644
--- a/media/libaom/src/aom_dsp/x86/obmc_sad_sse4.c
+++ b/libs/libaom/src/aom_dsp/x86/obmc_sad_sse4.c
diff --git a/media/libaom/src/aom_dsp/x86/obmc_variance_avx2.c b/libs/libaom/src/aom_dsp/x86/obmc_variance_avx2.c
index bfec0e8a8..bfec0e8a8 100644
--- a/media/libaom/src/aom_dsp/x86/obmc_variance_avx2.c
+++ b/libs/libaom/src/aom_dsp/x86/obmc_variance_avx2.c
diff --git a/media/libaom/src/aom_dsp/x86/obmc_variance_sse4.c b/libs/libaom/src/aom_dsp/x86/obmc_variance_sse4.c
index aa73c392d..aa73c392d 100644
--- a/media/libaom/src/aom_dsp/x86/obmc_variance_sse4.c
+++ b/libs/libaom/src/aom_dsp/x86/obmc_variance_sse4.c
diff --git a/media/libaom/src/aom_dsp/x86/quantize_avx_x86_64.asm b/libs/libaom/src/aom_dsp/x86/quantize_avx_x86_64.asm
index d6e15c4be..d6e15c4be 100644
--- a/media/libaom/src/aom_dsp/x86/quantize_avx_x86_64.asm
+++ b/libs/libaom/src/aom_dsp/x86/quantize_avx_x86_64.asm
diff --git a/media/libaom/src/aom_dsp/x86/quantize_sse2.c b/libs/libaom/src/aom_dsp/x86/quantize_sse2.c
index ebef1fbac..ebef1fbac 100644
--- a/media/libaom/src/aom_dsp/x86/quantize_sse2.c
+++ b/libs/libaom/src/aom_dsp/x86/quantize_sse2.c
diff --git a/media/libaom/src/aom_dsp/x86/quantize_ssse3.c b/libs/libaom/src/aom_dsp/x86/quantize_ssse3.c
index 25980a055..25980a055 100644
--- a/media/libaom/src/aom_dsp/x86/quantize_ssse3.c
+++ b/libs/libaom/src/aom_dsp/x86/quantize_ssse3.c
diff --git a/media/libaom/src/aom_dsp/x86/quantize_ssse3_x86_64.asm b/libs/libaom/src/aom_dsp/x86/quantize_ssse3_x86_64.asm
index fa616a6f1..fa616a6f1 100644
--- a/media/libaom/src/aom_dsp/x86/quantize_ssse3_x86_64.asm
+++ b/libs/libaom/src/aom_dsp/x86/quantize_ssse3_x86_64.asm
diff --git a/media/libaom/src/aom_dsp/x86/quantize_x86.h b/libs/libaom/src/aom_dsp/x86/quantize_x86.h
index 5b040a278..5b040a278 100644
--- a/media/libaom/src/aom_dsp/x86/quantize_x86.h
+++ b/libs/libaom/src/aom_dsp/x86/quantize_x86.h
diff --git a/media/libaom/src/aom_dsp/x86/sad4d_avx2.c b/libs/libaom/src/aom_dsp/x86/sad4d_avx2.c
index 077125258..077125258 100644
--- a/media/libaom/src/aom_dsp/x86/sad4d_avx2.c
+++ b/libs/libaom/src/aom_dsp/x86/sad4d_avx2.c
diff --git a/media/libaom/src/aom_dsp/x86/sad4d_sse2.asm b/libs/libaom/src/aom_dsp/x86/sad4d_sse2.asm
index a9043742d..a9043742d 100644
--- a/media/libaom/src/aom_dsp/x86/sad4d_sse2.asm
+++ b/libs/libaom/src/aom_dsp/x86/sad4d_sse2.asm
diff --git a/media/libaom/src/aom_dsp/x86/sad_avx2.c b/libs/libaom/src/aom_dsp/x86/sad_avx2.c
index a50dba64a..a50dba64a 100644
--- a/media/libaom/src/aom_dsp/x86/sad_avx2.c
+++ b/libs/libaom/src/aom_dsp/x86/sad_avx2.c
diff --git a/media/libaom/src/aom_dsp/x86/sad_highbd_avx2.c b/libs/libaom/src/aom_dsp/x86/sad_highbd_avx2.c
index 2cff2e6a9..2cff2e6a9 100644
--- a/media/libaom/src/aom_dsp/x86/sad_highbd_avx2.c
+++ b/libs/libaom/src/aom_dsp/x86/sad_highbd_avx2.c
diff --git a/media/libaom/src/aom_dsp/x86/sad_impl_avx2.c b/libs/libaom/src/aom_dsp/x86/sad_impl_avx2.c
index f77a585b4..f77a585b4 100644
--- a/media/libaom/src/aom_dsp/x86/sad_impl_avx2.c
+++ b/libs/libaom/src/aom_dsp/x86/sad_impl_avx2.c
diff --git a/media/libaom/src/aom_dsp/x86/sad_sse2.asm b/libs/libaom/src/aom_dsp/x86/sad_sse2.asm
index 3251b7655..3251b7655 100644
--- a/media/libaom/src/aom_dsp/x86/sad_sse2.asm
+++ b/libs/libaom/src/aom_dsp/x86/sad_sse2.asm
diff --git a/media/libaom/src/aom_dsp/x86/sse_avx2.c b/libs/libaom/src/aom_dsp/x86/sse_avx2.c
index e6ee2fcab..e6ee2fcab 100644
--- a/media/libaom/src/aom_dsp/x86/sse_avx2.c
+++ b/libs/libaom/src/aom_dsp/x86/sse_avx2.c
diff --git a/media/libaom/src/aom_dsp/x86/sse_sse4.c b/libs/libaom/src/aom_dsp/x86/sse_sse4.c
index 5f95eb9ae..5f95eb9ae 100644
--- a/media/libaom/src/aom_dsp/x86/sse_sse4.c
+++ b/libs/libaom/src/aom_dsp/x86/sse_sse4.c
diff --git a/media/libaom/src/aom_dsp/x86/ssim_sse2_x86_64.asm b/libs/libaom/src/aom_dsp/x86/ssim_sse2_x86_64.asm
index 6d9b5a12f..6d9b5a12f 100644
--- a/media/libaom/src/aom_dsp/x86/ssim_sse2_x86_64.asm
+++ b/libs/libaom/src/aom_dsp/x86/ssim_sse2_x86_64.asm
diff --git a/media/libaom/src/aom_dsp/x86/subpel_variance_sse2.asm b/libs/libaom/src/aom_dsp/x86/subpel_variance_sse2.asm
index cbf28901b..cbf28901b 100644
--- a/media/libaom/src/aom_dsp/x86/subpel_variance_sse2.asm
+++ b/libs/libaom/src/aom_dsp/x86/subpel_variance_sse2.asm
diff --git a/media/libaom/src/aom_dsp/x86/subtract_avx2.c b/libs/libaom/src/aom_dsp/x86/subtract_avx2.c
index 40831600a..40831600a 100644
--- a/media/libaom/src/aom_dsp/x86/subtract_avx2.c
+++ b/libs/libaom/src/aom_dsp/x86/subtract_avx2.c
diff --git a/media/libaom/src/aom_dsp/x86/subtract_sse2.asm b/libs/libaom/src/aom_dsp/x86/subtract_sse2.asm
index 1a75a234f..1a75a234f 100644
--- a/media/libaom/src/aom_dsp/x86/subtract_sse2.asm
+++ b/libs/libaom/src/aom_dsp/x86/subtract_sse2.asm
diff --git a/media/libaom/src/aom_dsp/x86/sum_squares_avx2.c b/libs/libaom/src/aom_dsp/x86/sum_squares_avx2.c
index 97d78b684..97d78b684 100644
--- a/media/libaom/src/aom_dsp/x86/sum_squares_avx2.c
+++ b/libs/libaom/src/aom_dsp/x86/sum_squares_avx2.c
diff --git a/media/libaom/src/aom_dsp/x86/sum_squares_sse2.c b/libs/libaom/src/aom_dsp/x86/sum_squares_sse2.c
index 85b301a88..85b301a88 100644
--- a/media/libaom/src/aom_dsp/x86/sum_squares_sse2.c
+++ b/libs/libaom/src/aom_dsp/x86/sum_squares_sse2.c
diff --git a/media/libaom/src/aom_dsp/x86/sum_squares_sse2.h b/libs/libaom/src/aom_dsp/x86/sum_squares_sse2.h
index 491e31cc5..491e31cc5 100644
--- a/media/libaom/src/aom_dsp/x86/sum_squares_sse2.h
+++ b/libs/libaom/src/aom_dsp/x86/sum_squares_sse2.h
diff --git a/media/libaom/src/aom_dsp/x86/synonyms.h b/libs/libaom/src/aom_dsp/x86/synonyms.h
index 2e99bee3e..2e99bee3e 100644
--- a/media/libaom/src/aom_dsp/x86/synonyms.h
+++ b/libs/libaom/src/aom_dsp/x86/synonyms.h
diff --git a/media/libaom/src/aom_dsp/x86/synonyms_avx2.h b/libs/libaom/src/aom_dsp/x86/synonyms_avx2.h
index 4d6ee6ad6..4d6ee6ad6 100644
--- a/media/libaom/src/aom_dsp/x86/synonyms_avx2.h
+++ b/libs/libaom/src/aom_dsp/x86/synonyms_avx2.h
diff --git a/media/libaom/src/aom_dsp/x86/transpose_sse2.h b/libs/libaom/src/aom_dsp/x86/transpose_sse2.h
index 7ac692c78..7ac692c78 100644
--- a/media/libaom/src/aom_dsp/x86/transpose_sse2.h
+++ b/libs/libaom/src/aom_dsp/x86/transpose_sse2.h
diff --git a/media/libaom/src/aom_dsp/x86/txfm_common_avx2.h b/libs/libaom/src/aom_dsp/x86/txfm_common_avx2.h
index ea57c9f35..ea57c9f35 100644
--- a/media/libaom/src/aom_dsp/x86/txfm_common_avx2.h
+++ b/libs/libaom/src/aom_dsp/x86/txfm_common_avx2.h
diff --git a/media/libaom/src/aom_dsp/x86/txfm_common_sse2.h b/libs/libaom/src/aom_dsp/x86/txfm_common_sse2.h
index 9c99eb93b..9c99eb93b 100644
--- a/media/libaom/src/aom_dsp/x86/txfm_common_sse2.h
+++ b/libs/libaom/src/aom_dsp/x86/txfm_common_sse2.h
diff --git a/media/libaom/src/aom_dsp/x86/variance_avx2.c b/libs/libaom/src/aom_dsp/x86/variance_avx2.c
index c4919ba9b..c4919ba9b 100644
--- a/media/libaom/src/aom_dsp/x86/variance_avx2.c
+++ b/libs/libaom/src/aom_dsp/x86/variance_avx2.c
diff --git a/media/libaom/src/aom_dsp/x86/variance_impl_avx2.c b/libs/libaom/src/aom_dsp/x86/variance_impl_avx2.c
index f779270ae..f779270ae 100644
--- a/media/libaom/src/aom_dsp/x86/variance_impl_avx2.c
+++ b/libs/libaom/src/aom_dsp/x86/variance_impl_avx2.c
diff --git a/media/libaom/src/aom_dsp/x86/variance_impl_ssse3.c b/libs/libaom/src/aom_dsp/x86/variance_impl_ssse3.c
index 66b0d7d84..66b0d7d84 100644
--- a/media/libaom/src/aom_dsp/x86/variance_impl_ssse3.c
+++ b/libs/libaom/src/aom_dsp/x86/variance_impl_ssse3.c
diff --git a/media/libaom/src/aom_dsp/x86/variance_sse2.c b/libs/libaom/src/aom_dsp/x86/variance_sse2.c
index 4e2b5a1aa..4e2b5a1aa 100644
--- a/media/libaom/src/aom_dsp/x86/variance_sse2.c
+++ b/libs/libaom/src/aom_dsp/x86/variance_sse2.c
diff --git a/media/libaom/src/aom_mem/aom_mem.c b/libs/libaom/src/aom_mem/aom_mem.c
index e977b01d7..e977b01d7 100644
--- a/media/libaom/src/aom_mem/aom_mem.c
+++ b/libs/libaom/src/aom_mem/aom_mem.c
diff --git a/media/libaom/src/aom_mem/aom_mem.cmake b/libs/libaom/src/aom_mem/aom_mem.cmake
index 346588d2d..346588d2d 100644
--- a/media/libaom/src/aom_mem/aom_mem.cmake
+++ b/libs/libaom/src/aom_mem/aom_mem.cmake
diff --git a/media/libaom/src/aom_mem/aom_mem.h b/libs/libaom/src/aom_mem/aom_mem.h
index bc5d8bca3..bc5d8bca3 100644
--- a/media/libaom/src/aom_mem/aom_mem.h
+++ b/libs/libaom/src/aom_mem/aom_mem.h
diff --git a/media/libaom/src/aom_mem/include/aom_mem_intrnl.h b/libs/libaom/src/aom_mem/include/aom_mem_intrnl.h
index 2c9819de9..2c9819de9 100644
--- a/media/libaom/src/aom_mem/include/aom_mem_intrnl.h
+++ b/libs/libaom/src/aom_mem/include/aom_mem_intrnl.h
diff --git a/media/libaom/src/aom_ports/aom_once.h b/libs/libaom/src/aom_ports/aom_once.h
index d1a031bf1..d1a031bf1 100644
--- a/media/libaom/src/aom_ports/aom_once.h
+++ b/libs/libaom/src/aom_ports/aom_once.h
diff --git a/media/libaom/src/aom_ports/aom_ports.cmake b/libs/libaom/src/aom_ports/aom_ports.cmake
index d57989654..d57989654 100644
--- a/media/libaom/src/aom_ports/aom_ports.cmake
+++ b/libs/libaom/src/aom_ports/aom_ports.cmake
diff --git a/media/libaom/src/aom_ports/aom_timer.h b/libs/libaom/src/aom_ports/aom_timer.h
index 9b17b8983..9b17b8983 100644
--- a/media/libaom/src/aom_ports/aom_timer.h
+++ b/libs/libaom/src/aom_ports/aom_timer.h
diff --git a/media/libaom/src/aom_ports/arm.h b/libs/libaom/src/aom_ports/arm.h
index cb1fb9bec..cb1fb9bec 100644
--- a/media/libaom/src/aom_ports/arm.h
+++ b/libs/libaom/src/aom_ports/arm.h
diff --git a/media/libaom/src/aom_ports/arm_cpudetect.c b/libs/libaom/src/aom_ports/arm_cpudetect.c
index 5a75bb348..5a75bb348 100644
--- a/media/libaom/src/aom_ports/arm_cpudetect.c
+++ b/libs/libaom/src/aom_ports/arm_cpudetect.c
diff --git a/media/libaom/src/aom_ports/bitops.h b/libs/libaom/src/aom_ports/bitops.h
index 44df17307..44df17307 100644
--- a/media/libaom/src/aom_ports/bitops.h
+++ b/libs/libaom/src/aom_ports/bitops.h
diff --git a/media/libaom/src/aom_ports/emmintrin_compat.h b/libs/libaom/src/aom_ports/emmintrin_compat.h
index 85d218a3d..85d218a3d 100644
--- a/media/libaom/src/aom_ports/emmintrin_compat.h
+++ b/libs/libaom/src/aom_ports/emmintrin_compat.h
diff --git a/media/libaom/src/aom_ports/emms.asm b/libs/libaom/src/aom_ports/emms.asm
index 90776bacb..90776bacb 100644
--- a/media/libaom/src/aom_ports/emms.asm
+++ b/libs/libaom/src/aom_ports/emms.asm
diff --git a/media/libaom/src/aom_ports/mem.h b/libs/libaom/src/aom_ports/mem.h
index 9e3d42403..9e3d42403 100644
--- a/media/libaom/src/aom_ports/mem.h
+++ b/libs/libaom/src/aom_ports/mem.h
diff --git a/media/libaom/src/aom_ports/mem_ops.h b/libs/libaom/src/aom_ports/mem_ops.h
index 2b5bc0f0f..2b5bc0f0f 100644
--- a/media/libaom/src/aom_ports/mem_ops.h
+++ b/libs/libaom/src/aom_ports/mem_ops.h
diff --git a/media/libaom/src/aom_ports/mem_ops_aligned.h b/libs/libaom/src/aom_ports/mem_ops_aligned.h
index 37c367531..37c367531 100644
--- a/media/libaom/src/aom_ports/mem_ops_aligned.h
+++ b/libs/libaom/src/aom_ports/mem_ops_aligned.h
diff --git a/media/libaom/src/aom_ports/msvc.h b/libs/libaom/src/aom_ports/msvc.h
index e78e605f2..e78e605f2 100644
--- a/media/libaom/src/aom_ports/msvc.h
+++ b/libs/libaom/src/aom_ports/msvc.h
diff --git a/media/libaom/src/aom_ports/ppc.h b/libs/libaom/src/aom_ports/ppc.h
index 3159bda68..3159bda68 100644
--- a/media/libaom/src/aom_ports/ppc.h
+++ b/libs/libaom/src/aom_ports/ppc.h
diff --git a/media/libaom/src/aom_ports/ppc_cpudetect.c b/libs/libaom/src/aom_ports/ppc_cpudetect.c
index ce4d5ae23..ce4d5ae23 100644
--- a/media/libaom/src/aom_ports/ppc_cpudetect.c
+++ b/libs/libaom/src/aom_ports/ppc_cpudetect.c
diff --git a/media/libaom/src/aom_ports/sanitizer.h b/libs/libaom/src/aom_ports/sanitizer.h
index 1dd8eb4cf..1dd8eb4cf 100644
--- a/media/libaom/src/aom_ports/sanitizer.h
+++ b/libs/libaom/src/aom_ports/sanitizer.h
diff --git a/media/libaom/src/aom_ports/system_state.h b/libs/libaom/src/aom_ports/system_state.h
index 6640839d8..6640839d8 100644
--- a/media/libaom/src/aom_ports/system_state.h
+++ b/libs/libaom/src/aom_ports/system_state.h
diff --git a/media/libaom/src/aom_ports/x86.h b/libs/libaom/src/aom_ports/x86.h
index 8c1844871..8c1844871 100644
--- a/media/libaom/src/aom_ports/x86.h
+++ b/libs/libaom/src/aom_ports/x86.h
diff --git a/media/libaom/src/aom_ports/x86_abi_support.asm b/libs/libaom/src/aom_ports/x86_abi_support.asm
index 64489908f..64489908f 100644
--- a/media/libaom/src/aom_ports/x86_abi_support.asm
+++ b/libs/libaom/src/aom_ports/x86_abi_support.asm
diff --git a/media/libaom/src/aom_scale/aom_scale.cmake b/libs/libaom/src/aom_scale/aom_scale.cmake
index e83299320..e83299320 100644
--- a/media/libaom/src/aom_scale/aom_scale.cmake
+++ b/libs/libaom/src/aom_scale/aom_scale.cmake
diff --git a/media/libaom/src/aom_scale/aom_scale.h b/libs/libaom/src/aom_scale/aom_scale.h
index 11812a145..11812a145 100644
--- a/media/libaom/src/aom_scale/aom_scale.h
+++ b/libs/libaom/src/aom_scale/aom_scale.h
diff --git a/media/libaom/src/aom_scale/aom_scale_rtcd.c b/libs/libaom/src/aom_scale/aom_scale_rtcd.c
index a04e053b0..a04e053b0 100644
--- a/media/libaom/src/aom_scale/aom_scale_rtcd.c
+++ b/libs/libaom/src/aom_scale/aom_scale_rtcd.c
diff --git a/media/libaom/src/aom_scale/aom_scale_rtcd.pl b/libs/libaom/src/aom_scale/aom_scale_rtcd.pl
index eef6f16a7..eef6f16a7 100644
--- a/media/libaom/src/aom_scale/aom_scale_rtcd.pl
+++ b/libs/libaom/src/aom_scale/aom_scale_rtcd.pl
diff --git a/media/libaom/src/aom_scale/generic/aom_scale.c b/libs/libaom/src/aom_scale/generic/aom_scale.c
index 206c42c9f..206c42c9f 100644
--- a/media/libaom/src/aom_scale/generic/aom_scale.c
+++ b/libs/libaom/src/aom_scale/generic/aom_scale.c
diff --git a/media/libaom/src/aom_scale/generic/gen_scalers.c b/libs/libaom/src/aom_scale/generic/gen_scalers.c
index 549e2aa69..549e2aa69 100644
--- a/media/libaom/src/aom_scale/generic/gen_scalers.c
+++ b/libs/libaom/src/aom_scale/generic/gen_scalers.c
diff --git a/media/libaom/src/aom_scale/generic/yv12config.c b/libs/libaom/src/aom_scale/generic/yv12config.c
index 1f80d7ba7..1f80d7ba7 100644
--- a/media/libaom/src/aom_scale/generic/yv12config.c
+++ b/libs/libaom/src/aom_scale/generic/yv12config.c
diff --git a/media/libaom/src/aom_scale/generic/yv12extend.c b/libs/libaom/src/aom_scale/generic/yv12extend.c
index 834a59dbf..834a59dbf 100644
--- a/media/libaom/src/aom_scale/generic/yv12extend.c
+++ b/libs/libaom/src/aom_scale/generic/yv12extend.c
diff --git a/media/libaom/src/aom_scale/mips/dspr2/yv12extend_dspr2.c b/libs/libaom/src/aom_scale/mips/dspr2/yv12extend_dspr2.c
index 869e594d7..869e594d7 100644
--- a/media/libaom/src/aom_scale/mips/dspr2/yv12extend_dspr2.c
+++ b/libs/libaom/src/aom_scale/mips/dspr2/yv12extend_dspr2.c
diff --git a/media/libaom/src/aom_scale/yv12config.h b/libs/libaom/src/aom_scale/yv12config.h
index 3642bb7f3..3642bb7f3 100644
--- a/media/libaom/src/aom_scale/yv12config.h
+++ b/libs/libaom/src/aom_scale/yv12config.h
diff --git a/media/libaom/src/aom_util/aom_thread.c b/libs/libaom/src/aom_util/aom_thread.c
index a749a2240..a749a2240 100644
--- a/media/libaom/src/aom_util/aom_thread.c
+++ b/libs/libaom/src/aom_util/aom_thread.c
diff --git a/media/libaom/src/aom_util/aom_thread.h b/libs/libaom/src/aom_util/aom_thread.h
index 8d0431258..8d0431258 100644
--- a/media/libaom/src/aom_util/aom_thread.h
+++ b/libs/libaom/src/aom_util/aom_thread.h
diff --git a/media/libaom/src/aom_util/aom_util.cmake b/libs/libaom/src/aom_util/aom_util.cmake
index 1a1bfe1e6..1a1bfe1e6 100644
--- a/media/libaom/src/aom_util/aom_util.cmake
+++ b/libs/libaom/src/aom_util/aom_util.cmake
diff --git a/media/libaom/src/aom_util/debug_util.c b/libs/libaom/src/aom_util/debug_util.c
index 5762e693b..5762e693b 100644
--- a/media/libaom/src/aom_util/debug_util.c
+++ b/libs/libaom/src/aom_util/debug_util.c
diff --git a/media/libaom/src/aom_util/debug_util.h b/libs/libaom/src/aom_util/debug_util.h
index 23cad2a5b..23cad2a5b 100644
--- a/media/libaom/src/aom_util/debug_util.h
+++ b/libs/libaom/src/aom_util/debug_util.h
diff --git a/media/libaom/src/aom_util/endian_inl.h b/libs/libaom/src/aom_util/endian_inl.h
index f536ec5b8..f536ec5b8 100644
--- a/media/libaom/src/aom_util/endian_inl.h
+++ b/libs/libaom/src/aom_util/endian_inl.h
diff --git a/media/libaom/src/apps/aomdec.c b/libs/libaom/src/apps/aomdec.c
index 2591d41a6..2591d41a6 100644
--- a/media/libaom/src/apps/aomdec.c
+++ b/libs/libaom/src/apps/aomdec.c
diff --git a/media/libaom/src/apps/aomenc.c b/libs/libaom/src/apps/aomenc.c
index bb57726b4..bb57726b4 100644
--- a/media/libaom/src/apps/aomenc.c
+++ b/libs/libaom/src/apps/aomenc.c
diff --git a/media/libaom/src/apps/aomenc.h b/libs/libaom/src/apps/aomenc.h
index a38258b87..a38258b87 100644
--- a/media/libaom/src/apps/aomenc.h
+++ b/libs/libaom/src/apps/aomenc.h
diff --git a/media/libaom/src/av1/av1.cmake b/libs/libaom/src/av1/av1.cmake
index 2ab349630..2ab349630 100644
--- a/media/libaom/src/av1/av1.cmake
+++ b/libs/libaom/src/av1/av1.cmake
diff --git a/media/libaom/src/av1/av1_cx_iface.c b/libs/libaom/src/av1/av1_cx_iface.c
index 676eaa0ad..676eaa0ad 100644
--- a/media/libaom/src/av1/av1_cx_iface.c
+++ b/libs/libaom/src/av1/av1_cx_iface.c
diff --git a/media/libaom/src/av1/av1_dx_iface.c b/libs/libaom/src/av1/av1_dx_iface.c
index d821a52f6..d821a52f6 100644
--- a/media/libaom/src/av1/av1_dx_iface.c
+++ b/libs/libaom/src/av1/av1_dx_iface.c
diff --git a/media/libaom/src/av1/av1_iface_common.h b/libs/libaom/src/av1/av1_iface_common.h
index 9b5ffcba4..9b5ffcba4 100644
--- a/media/libaom/src/av1/av1_iface_common.h
+++ b/libs/libaom/src/av1/av1_iface_common.h
diff --git a/media/libaom/src/av1/common/alloccommon.c b/libs/libaom/src/av1/common/alloccommon.c
index badee3df9..badee3df9 100644
--- a/media/libaom/src/av1/common/alloccommon.c
+++ b/libs/libaom/src/av1/common/alloccommon.c
diff --git a/media/libaom/src/av1/common/alloccommon.h b/libs/libaom/src/av1/common/alloccommon.h
index fe8e0c530..fe8e0c530 100644
--- a/media/libaom/src/av1/common/alloccommon.h
+++ b/libs/libaom/src/av1/common/alloccommon.h
diff --git a/media/libaom/src/av1/common/arm/av1_inv_txfm_neon.c b/libs/libaom/src/av1/common/arm/av1_inv_txfm_neon.c
index 2f3567aea..2f3567aea 100644
--- a/media/libaom/src/av1/common/arm/av1_inv_txfm_neon.c
+++ b/libs/libaom/src/av1/common/arm/av1_inv_txfm_neon.c
diff --git a/media/libaom/src/av1/common/arm/av1_inv_txfm_neon.h b/libs/libaom/src/av1/common/arm/av1_inv_txfm_neon.h
index 9ec658291..9ec658291 100644
--- a/media/libaom/src/av1/common/arm/av1_inv_txfm_neon.h
+++ b/libs/libaom/src/av1/common/arm/av1_inv_txfm_neon.h
diff --git a/media/libaom/src/av1/common/arm/av1_txfm_neon.c b/libs/libaom/src/av1/common/arm/av1_txfm_neon.c
index 7e3a05ab7..7e3a05ab7 100644
--- a/media/libaom/src/av1/common/arm/av1_txfm_neon.c
+++ b/libs/libaom/src/av1/common/arm/av1_txfm_neon.c
diff --git a/media/libaom/src/av1/common/arm/blend_a64_hmask_neon.c b/libs/libaom/src/av1/common/arm/blend_a64_hmask_neon.c
index 7134f183e..7134f183e 100644
--- a/media/libaom/src/av1/common/arm/blend_a64_hmask_neon.c
+++ b/libs/libaom/src/av1/common/arm/blend_a64_hmask_neon.c
diff --git a/media/libaom/src/av1/common/arm/blend_a64_vmask_neon.c b/libs/libaom/src/av1/common/arm/blend_a64_vmask_neon.c
index 194e94c8c..194e94c8c 100644
--- a/media/libaom/src/av1/common/arm/blend_a64_vmask_neon.c
+++ b/libs/libaom/src/av1/common/arm/blend_a64_vmask_neon.c
diff --git a/media/libaom/src/av1/common/arm/cfl_neon.c b/libs/libaom/src/av1/common/arm/cfl_neon.c
index 371be5f0e..371be5f0e 100644
--- a/media/libaom/src/av1/common/arm/cfl_neon.c
+++ b/libs/libaom/src/av1/common/arm/cfl_neon.c
diff --git a/media/libaom/src/av1/common/arm/convolve_neon.c b/libs/libaom/src/av1/common/arm/convolve_neon.c
index 51c96961c..51c96961c 100644
--- a/media/libaom/src/av1/common/arm/convolve_neon.c
+++ b/libs/libaom/src/av1/common/arm/convolve_neon.c
diff --git a/media/libaom/src/av1/common/arm/convolve_neon.h b/libs/libaom/src/av1/common/arm/convolve_neon.h
index dbcfab631..dbcfab631 100644
--- a/media/libaom/src/av1/common/arm/convolve_neon.h
+++ b/libs/libaom/src/av1/common/arm/convolve_neon.h
diff --git a/media/libaom/src/av1/common/arm/jnt_convolve_neon.c b/libs/libaom/src/av1/common/arm/jnt_convolve_neon.c
index 92112fb85..92112fb85 100644
--- a/media/libaom/src/av1/common/arm/jnt_convolve_neon.c
+++ b/libs/libaom/src/av1/common/arm/jnt_convolve_neon.c
diff --git a/media/libaom/src/av1/common/arm/mem_neon.h b/libs/libaom/src/av1/common/arm/mem_neon.h
index 171055fe1..171055fe1 100644
--- a/media/libaom/src/av1/common/arm/mem_neon.h
+++ b/libs/libaom/src/av1/common/arm/mem_neon.h
diff --git a/media/libaom/src/av1/common/arm/reconinter_neon.c b/libs/libaom/src/av1/common/arm/reconinter_neon.c
index 44e064195..44e064195 100644
--- a/media/libaom/src/av1/common/arm/reconinter_neon.c
+++ b/libs/libaom/src/av1/common/arm/reconinter_neon.c
diff --git a/media/libaom/src/av1/common/arm/selfguided_neon.c b/libs/libaom/src/av1/common/arm/selfguided_neon.c
index fc404a64a..fc404a64a 100644
--- a/media/libaom/src/av1/common/arm/selfguided_neon.c
+++ b/libs/libaom/src/av1/common/arm/selfguided_neon.c
diff --git a/media/libaom/src/av1/common/arm/transpose_neon.h b/libs/libaom/src/av1/common/arm/transpose_neon.h
index 91d89b43f..91d89b43f 100644
--- a/media/libaom/src/av1/common/arm/transpose_neon.h
+++ b/libs/libaom/src/av1/common/arm/transpose_neon.h
diff --git a/media/libaom/src/av1/common/arm/warp_plane_neon.c b/libs/libaom/src/av1/common/arm/warp_plane_neon.c
index c10a34fcd..c10a34fcd 100644
--- a/media/libaom/src/av1/common/arm/warp_plane_neon.c
+++ b/libs/libaom/src/av1/common/arm/warp_plane_neon.c
diff --git a/media/libaom/src/av1/common/arm/wiener_convolve_neon.c b/libs/libaom/src/av1/common/arm/wiener_convolve_neon.c
index a9bb5bcf0..a9bb5bcf0 100644
--- a/media/libaom/src/av1/common/arm/wiener_convolve_neon.c
+++ b/libs/libaom/src/av1/common/arm/wiener_convolve_neon.c
diff --git a/media/libaom/src/av1/common/av1_common_int.h b/libs/libaom/src/av1/common/av1_common_int.h
index 0403405e9..0403405e9 100644
--- a/media/libaom/src/av1/common/av1_common_int.h
+++ b/libs/libaom/src/av1/common/av1_common_int.h
diff --git a/media/libaom/src/av1/common/av1_inv_txfm1d.c b/libs/libaom/src/av1/common/av1_inv_txfm1d.c
index 8d69efcd2..8d69efcd2 100644
--- a/media/libaom/src/av1/common/av1_inv_txfm1d.c
+++ b/libs/libaom/src/av1/common/av1_inv_txfm1d.c
diff --git a/media/libaom/src/av1/common/av1_inv_txfm1d.h b/libs/libaom/src/av1/common/av1_inv_txfm1d.h
index e1d5d98d1..e1d5d98d1 100644
--- a/media/libaom/src/av1/common/av1_inv_txfm1d.h
+++ b/libs/libaom/src/av1/common/av1_inv_txfm1d.h
diff --git a/media/libaom/src/av1/common/av1_inv_txfm1d_cfg.h b/libs/libaom/src/av1/common/av1_inv_txfm1d_cfg.h
index 47fedbd2a..47fedbd2a 100644
--- a/media/libaom/src/av1/common/av1_inv_txfm1d_cfg.h
+++ b/libs/libaom/src/av1/common/av1_inv_txfm1d_cfg.h
diff --git a/media/libaom/src/av1/common/av1_inv_txfm2d.c b/libs/libaom/src/av1/common/av1_inv_txfm2d.c
index 559d12129..559d12129 100644
--- a/media/libaom/src/av1/common/av1_inv_txfm2d.c
+++ b/libs/libaom/src/av1/common/av1_inv_txfm2d.c
diff --git a/media/libaom/src/av1/common/av1_loopfilter.c b/libs/libaom/src/av1/common/av1_loopfilter.c
index c756760de..c756760de 100644
--- a/media/libaom/src/av1/common/av1_loopfilter.c
+++ b/libs/libaom/src/av1/common/av1_loopfilter.c
diff --git a/media/libaom/src/av1/common/av1_loopfilter.h b/libs/libaom/src/av1/common/av1_loopfilter.h
index ce26d1647..ce26d1647 100644
--- a/media/libaom/src/av1/common/av1_loopfilter.h
+++ b/libs/libaom/src/av1/common/av1_loopfilter.h
diff --git a/media/libaom/src/av1/common/av1_rtcd.c b/libs/libaom/src/av1/common/av1_rtcd.c
index a77a4d254..a77a4d254 100644
--- a/media/libaom/src/av1/common/av1_rtcd.c
+++ b/libs/libaom/src/av1/common/av1_rtcd.c
diff --git a/media/libaom/src/av1/common/av1_rtcd_defs.pl b/libs/libaom/src/av1/common/av1_rtcd_defs.pl
index 296c6c572..296c6c572 100644
--- a/media/libaom/src/av1/common/av1_rtcd_defs.pl
+++ b/libs/libaom/src/av1/common/av1_rtcd_defs.pl
diff --git a/media/libaom/src/av1/common/av1_txfm.c b/libs/libaom/src/av1/common/av1_txfm.c
index ac43402f4..ac43402f4 100644
--- a/media/libaom/src/av1/common/av1_txfm.c
+++ b/libs/libaom/src/av1/common/av1_txfm.c
diff --git a/media/libaom/src/av1/common/av1_txfm.h b/libs/libaom/src/av1/common/av1_txfm.h
index 20049b680..20049b680 100644
--- a/media/libaom/src/av1/common/av1_txfm.h
+++ b/libs/libaom/src/av1/common/av1_txfm.h
diff --git a/media/libaom/src/av1/common/blockd.c b/libs/libaom/src/av1/common/blockd.c
index 00725ea2d..00725ea2d 100644
--- a/media/libaom/src/av1/common/blockd.c
+++ b/libs/libaom/src/av1/common/blockd.c
diff --git a/media/libaom/src/av1/common/blockd.h b/libs/libaom/src/av1/common/blockd.h
index 47597bc83..47597bc83 100644
--- a/media/libaom/src/av1/common/blockd.h
+++ b/libs/libaom/src/av1/common/blockd.h
diff --git a/media/libaom/src/av1/common/cdef.c b/libs/libaom/src/av1/common/cdef.c
index ef7b866b5..ef7b866b5 100644
--- a/media/libaom/src/av1/common/cdef.c
+++ b/libs/libaom/src/av1/common/cdef.c
diff --git a/media/libaom/src/av1/common/cdef.h b/libs/libaom/src/av1/common/cdef.h
index c36fd135a..c36fd135a 100644
--- a/media/libaom/src/av1/common/cdef.h
+++ b/libs/libaom/src/av1/common/cdef.h
diff --git a/media/libaom/src/av1/common/cdef_block.c b/libs/libaom/src/av1/common/cdef_block.c
index 7120705d3..7120705d3 100644
--- a/media/libaom/src/av1/common/cdef_block.c
+++ b/libs/libaom/src/av1/common/cdef_block.c
diff --git a/media/libaom/src/av1/common/cdef_block.h b/libs/libaom/src/av1/common/cdef_block.h
index 6b0ae0a9d..6b0ae0a9d 100644
--- a/media/libaom/src/av1/common/cdef_block.h
+++ b/libs/libaom/src/av1/common/cdef_block.h
diff --git a/media/libaom/src/av1/common/cdef_block_avx2.c b/libs/libaom/src/av1/common/cdef_block_avx2.c
index e2b85b3e2..e2b85b3e2 100644
--- a/media/libaom/src/av1/common/cdef_block_avx2.c
+++ b/libs/libaom/src/av1/common/cdef_block_avx2.c
diff --git a/media/libaom/src/av1/common/cdef_block_neon.c b/libs/libaom/src/av1/common/cdef_block_neon.c
index 2d6bc65e3..2d6bc65e3 100644
--- a/media/libaom/src/av1/common/cdef_block_neon.c
+++ b/libs/libaom/src/av1/common/cdef_block_neon.c
diff --git a/media/libaom/src/av1/common/cdef_block_simd.h b/libs/libaom/src/av1/common/cdef_block_simd.h
index 5a52bc1e4..5a52bc1e4 100644
--- a/media/libaom/src/av1/common/cdef_block_simd.h
+++ b/libs/libaom/src/av1/common/cdef_block_simd.h
diff --git a/media/libaom/src/av1/common/cdef_block_sse2.c b/libs/libaom/src/av1/common/cdef_block_sse2.c
index 73f115d17..73f115d17 100644
--- a/media/libaom/src/av1/common/cdef_block_sse2.c
+++ b/libs/libaom/src/av1/common/cdef_block_sse2.c
diff --git a/media/libaom/src/av1/common/cdef_block_sse4.c b/libs/libaom/src/av1/common/cdef_block_sse4.c
index 349329af6..349329af6 100644
--- a/media/libaom/src/av1/common/cdef_block_sse4.c
+++ b/libs/libaom/src/av1/common/cdef_block_sse4.c
diff --git a/media/libaom/src/av1/common/cdef_block_ssse3.c b/libs/libaom/src/av1/common/cdef_block_ssse3.c
index 3a93b150f..3a93b150f 100644
--- a/media/libaom/src/av1/common/cdef_block_ssse3.c
+++ b/libs/libaom/src/av1/common/cdef_block_ssse3.c
diff --git a/media/libaom/src/av1/common/cfl.c b/libs/libaom/src/av1/common/cfl.c
index 98199cb95..98199cb95 100644
--- a/media/libaom/src/av1/common/cfl.c
+++ b/libs/libaom/src/av1/common/cfl.c
diff --git a/media/libaom/src/av1/common/cfl.h b/libs/libaom/src/av1/common/cfl.h
index a1d6dc2ea..a1d6dc2ea 100644
--- a/media/libaom/src/av1/common/cfl.h
+++ b/libs/libaom/src/av1/common/cfl.h
diff --git a/media/libaom/src/av1/common/common.h b/libs/libaom/src/av1/common/common.h
index bed6083db..bed6083db 100644
--- a/media/libaom/src/av1/common/common.h
+++ b/libs/libaom/src/av1/common/common.h
diff --git a/media/libaom/src/av1/common/common_data.h b/libs/libaom/src/av1/common/common_data.h
index 402845caf..402845caf 100644
--- a/media/libaom/src/av1/common/common_data.h
+++ b/libs/libaom/src/av1/common/common_data.h
diff --git a/media/libaom/src/av1/common/convolve.c b/libs/libaom/src/av1/common/convolve.c
index e177e3cad..e177e3cad 100644
--- a/media/libaom/src/av1/common/convolve.c
+++ b/libs/libaom/src/av1/common/convolve.c
diff --git a/media/libaom/src/av1/common/convolve.h b/libs/libaom/src/av1/common/convolve.h
index 04df86c42..04df86c42 100644
--- a/media/libaom/src/av1/common/convolve.h
+++ b/libs/libaom/src/av1/common/convolve.h
diff --git a/media/libaom/src/av1/common/debugmodes.c b/libs/libaom/src/av1/common/debugmodes.c
index ff02ddde0..ff02ddde0 100644
--- a/media/libaom/src/av1/common/debugmodes.c
+++ b/libs/libaom/src/av1/common/debugmodes.c
diff --git a/media/libaom/src/av1/common/entropy.c b/libs/libaom/src/av1/common/entropy.c
index 1f7a0efe0..1f7a0efe0 100644
--- a/media/libaom/src/av1/common/entropy.c
+++ b/libs/libaom/src/av1/common/entropy.c
diff --git a/media/libaom/src/av1/common/entropy.h b/libs/libaom/src/av1/common/entropy.h
index ee78f56a3..ee78f56a3 100644
--- a/media/libaom/src/av1/common/entropy.h
+++ b/libs/libaom/src/av1/common/entropy.h
diff --git a/media/libaom/src/av1/common/entropymode.c b/libs/libaom/src/av1/common/entropymode.c
index 5f061be35..5f061be35 100644
--- a/media/libaom/src/av1/common/entropymode.c
+++ b/libs/libaom/src/av1/common/entropymode.c
diff --git a/media/libaom/src/av1/common/entropymode.h b/libs/libaom/src/av1/common/entropymode.h
index bbbf55dc8..bbbf55dc8 100644
--- a/media/libaom/src/av1/common/entropymode.h
+++ b/libs/libaom/src/av1/common/entropymode.h
diff --git a/media/libaom/src/av1/common/entropymv.c b/libs/libaom/src/av1/common/entropymv.c
index e1e42f2f1..e1e42f2f1 100644
--- a/media/libaom/src/av1/common/entropymv.c
+++ b/libs/libaom/src/av1/common/entropymv.c
diff --git a/media/libaom/src/av1/common/entropymv.h b/libs/libaom/src/av1/common/entropymv.h
index cddc80768..cddc80768 100644
--- a/media/libaom/src/av1/common/entropymv.h
+++ b/libs/libaom/src/av1/common/entropymv.h
diff --git a/media/libaom/src/av1/common/enums.h b/libs/libaom/src/av1/common/enums.h
index 0c09a1bc7..0c09a1bc7 100644
--- a/media/libaom/src/av1/common/enums.h
+++ b/libs/libaom/src/av1/common/enums.h
diff --git a/media/libaom/src/av1/common/filter.h b/libs/libaom/src/av1/common/filter.h
index 91791d3dc..91791d3dc 100644
--- a/media/libaom/src/av1/common/filter.h
+++ b/libs/libaom/src/av1/common/filter.h
diff --git a/media/libaom/src/av1/common/frame_buffers.c b/libs/libaom/src/av1/common/frame_buffers.c
index f10ccd594..f10ccd594 100644
--- a/media/libaom/src/av1/common/frame_buffers.c
+++ b/libs/libaom/src/av1/common/frame_buffers.c
diff --git a/media/libaom/src/av1/common/frame_buffers.h b/libs/libaom/src/av1/common/frame_buffers.h
index 16188e51c..16188e51c 100644
--- a/media/libaom/src/av1/common/frame_buffers.h
+++ b/libs/libaom/src/av1/common/frame_buffers.h
diff --git a/media/libaom/src/av1/common/idct.c b/libs/libaom/src/av1/common/idct.c
index bff438f3c..bff438f3c 100644
--- a/media/libaom/src/av1/common/idct.c
+++ b/libs/libaom/src/av1/common/idct.c
diff --git a/media/libaom/src/av1/common/idct.h b/libs/libaom/src/av1/common/idct.h
index 004d25d49..004d25d49 100644
--- a/media/libaom/src/av1/common/idct.h
+++ b/libs/libaom/src/av1/common/idct.h
diff --git a/media/libaom/src/av1/common/loopfiltermask.c b/libs/libaom/src/av1/common/loopfiltermask.c
index 157310f2d..157310f2d 100644
--- a/media/libaom/src/av1/common/loopfiltermask.c
+++ b/libs/libaom/src/av1/common/loopfiltermask.c
diff --git a/media/libaom/src/av1/common/mv.h b/libs/libaom/src/av1/common/mv.h
index be539e820..be539e820 100644
--- a/media/libaom/src/av1/common/mv.h
+++ b/libs/libaom/src/av1/common/mv.h
diff --git a/media/libaom/src/av1/common/mvref_common.c b/libs/libaom/src/av1/common/mvref_common.c
index db3098cc0..db3098cc0 100644
--- a/media/libaom/src/av1/common/mvref_common.c
+++ b/libs/libaom/src/av1/common/mvref_common.c
diff --git a/media/libaom/src/av1/common/mvref_common.h b/libs/libaom/src/av1/common/mvref_common.h
index 05a0dbc04..05a0dbc04 100644
--- a/media/libaom/src/av1/common/mvref_common.h
+++ b/libs/libaom/src/av1/common/mvref_common.h
diff --git a/media/libaom/src/av1/common/obmc.h b/libs/libaom/src/av1/common/obmc.h
index cc97b6bb1..cc97b6bb1 100644
--- a/media/libaom/src/av1/common/obmc.h
+++ b/libs/libaom/src/av1/common/obmc.h
diff --git a/media/libaom/src/av1/common/obu_util.c b/libs/libaom/src/av1/common/obu_util.c
index 7d2694b89..7d2694b89 100644
--- a/media/libaom/src/av1/common/obu_util.c
+++ b/libs/libaom/src/av1/common/obu_util.c
diff --git a/media/libaom/src/av1/common/obu_util.h b/libs/libaom/src/av1/common/obu_util.h
index 7c56904c8..7c56904c8 100644
--- a/media/libaom/src/av1/common/obu_util.h
+++ b/libs/libaom/src/av1/common/obu_util.h
diff --git a/media/libaom/src/av1/common/odintrin.c b/libs/libaom/src/av1/common/odintrin.c
index 7584b2e52..7584b2e52 100644
--- a/media/libaom/src/av1/common/odintrin.c
+++ b/libs/libaom/src/av1/common/odintrin.c
diff --git a/media/libaom/src/av1/common/odintrin.h b/libs/libaom/src/av1/common/odintrin.h
index e1db0f44d..e1db0f44d 100644
--- a/media/libaom/src/av1/common/odintrin.h
+++ b/libs/libaom/src/av1/common/odintrin.h
diff --git a/media/libaom/src/av1/common/ppc/cfl_ppc.c b/libs/libaom/src/av1/common/ppc/cfl_ppc.c
index 6f88768f2..6f88768f2 100644
--- a/media/libaom/src/av1/common/ppc/cfl_ppc.c
+++ b/libs/libaom/src/av1/common/ppc/cfl_ppc.c
diff --git a/media/libaom/src/av1/common/pred_common.c b/libs/libaom/src/av1/common/pred_common.c
index 5952441d1..5952441d1 100644
--- a/media/libaom/src/av1/common/pred_common.c
+++ b/libs/libaom/src/av1/common/pred_common.c
diff --git a/media/libaom/src/av1/common/pred_common.h b/libs/libaom/src/av1/common/pred_common.h
index d1dab97e7..d1dab97e7 100644
--- a/media/libaom/src/av1/common/pred_common.h
+++ b/libs/libaom/src/av1/common/pred_common.h
diff --git a/media/libaom/src/av1/common/quant_common.c b/libs/libaom/src/av1/common/quant_common.c
index e96d71a3b..e96d71a3b 100644
--- a/media/libaom/src/av1/common/quant_common.c
+++ b/libs/libaom/src/av1/common/quant_common.c
diff --git a/media/libaom/src/av1/common/quant_common.h b/libs/libaom/src/av1/common/quant_common.h
index 9c30204ff..9c30204ff 100644
--- a/media/libaom/src/av1/common/quant_common.h
+++ b/libs/libaom/src/av1/common/quant_common.h
diff --git a/media/libaom/src/av1/common/reconinter.c b/libs/libaom/src/av1/common/reconinter.c
index 287adddcc..287adddcc 100644
--- a/media/libaom/src/av1/common/reconinter.c
+++ b/libs/libaom/src/av1/common/reconinter.c
diff --git a/media/libaom/src/av1/common/reconinter.h b/libs/libaom/src/av1/common/reconinter.h
index fe3c6a621..fe3c6a621 100644
--- a/media/libaom/src/av1/common/reconinter.h
+++ b/libs/libaom/src/av1/common/reconinter.h
diff --git a/media/libaom/src/av1/common/reconintra.c b/libs/libaom/src/av1/common/reconintra.c
index 1307a0313..1307a0313 100644
--- a/media/libaom/src/av1/common/reconintra.c
+++ b/libs/libaom/src/av1/common/reconintra.c
diff --git a/media/libaom/src/av1/common/reconintra.h b/libs/libaom/src/av1/common/reconintra.h
index 9d203569c..9d203569c 100644
--- a/media/libaom/src/av1/common/reconintra.h
+++ b/libs/libaom/src/av1/common/reconintra.h
diff --git a/media/libaom/src/av1/common/resize.c b/libs/libaom/src/av1/common/resize.c
index 98f28f7b5..98f28f7b5 100644
--- a/media/libaom/src/av1/common/resize.c
+++ b/libs/libaom/src/av1/common/resize.c
diff --git a/media/libaom/src/av1/common/resize.h b/libs/libaom/src/av1/common/resize.h
index 8ee859e5c..8ee859e5c 100644
--- a/media/libaom/src/av1/common/resize.h
+++ b/libs/libaom/src/av1/common/resize.h
diff --git a/media/libaom/src/av1/common/restoration.c b/libs/libaom/src/av1/common/restoration.c
index a0f37ad63..a0f37ad63 100644
--- a/media/libaom/src/av1/common/restoration.c
+++ b/libs/libaom/src/av1/common/restoration.c
diff --git a/media/libaom/src/av1/common/restoration.h b/libs/libaom/src/av1/common/restoration.h
index 3b80dd5a9..3b80dd5a9 100644
--- a/media/libaom/src/av1/common/restoration.h
+++ b/libs/libaom/src/av1/common/restoration.h
diff --git a/media/libaom/src/av1/common/scale.c b/libs/libaom/src/av1/common/scale.c
index 3b14c0a2c..3b14c0a2c 100644
--- a/media/libaom/src/av1/common/scale.c
+++ b/libs/libaom/src/av1/common/scale.c
diff --git a/media/libaom/src/av1/common/scale.h b/libs/libaom/src/av1/common/scale.h
index 16b40bde8..16b40bde8 100644
--- a/media/libaom/src/av1/common/scale.h
+++ b/libs/libaom/src/av1/common/scale.h
diff --git a/media/libaom/src/av1/common/scan.c b/libs/libaom/src/av1/common/scan.c
index c1d4f3581..c1d4f3581 100644
--- a/media/libaom/src/av1/common/scan.c
+++ b/libs/libaom/src/av1/common/scan.c
diff --git a/media/libaom/src/av1/common/scan.h b/libs/libaom/src/av1/common/scan.h
index d9620e1c5..d9620e1c5 100644
--- a/media/libaom/src/av1/common/scan.h
+++ b/libs/libaom/src/av1/common/scan.h
diff --git a/media/libaom/src/av1/common/seg_common.c b/libs/libaom/src/av1/common/seg_common.c
index 60b185161..60b185161 100644
--- a/media/libaom/src/av1/common/seg_common.c
+++ b/libs/libaom/src/av1/common/seg_common.c
diff --git a/media/libaom/src/av1/common/seg_common.h b/libs/libaom/src/av1/common/seg_common.h
index aeb9c1768..aeb9c1768 100644
--- a/media/libaom/src/av1/common/seg_common.h
+++ b/libs/libaom/src/av1/common/seg_common.h
diff --git a/media/libaom/src/av1/common/thread_common.c b/libs/libaom/src/av1/common/thread_common.c
index f3c8795f8..f3c8795f8 100644
--- a/media/libaom/src/av1/common/thread_common.c
+++ b/libs/libaom/src/av1/common/thread_common.c
diff --git a/media/libaom/src/av1/common/thread_common.h b/libs/libaom/src/av1/common/thread_common.h
index 7397f1c54..7397f1c54 100644
--- a/media/libaom/src/av1/common/thread_common.h
+++ b/libs/libaom/src/av1/common/thread_common.h
diff --git a/media/libaom/src/av1/common/tile_common.c b/libs/libaom/src/av1/common/tile_common.c
index 1b11bd760..1b11bd760 100644
--- a/media/libaom/src/av1/common/tile_common.c
+++ b/libs/libaom/src/av1/common/tile_common.c
diff --git a/media/libaom/src/av1/common/tile_common.h b/libs/libaom/src/av1/common/tile_common.h
index ca7c5f496..ca7c5f496 100644
--- a/media/libaom/src/av1/common/tile_common.h
+++ b/libs/libaom/src/av1/common/tile_common.h
diff --git a/media/libaom/src/av1/common/timing.c b/libs/libaom/src/av1/common/timing.c
index a959cdf76..a959cdf76 100644
--- a/media/libaom/src/av1/common/timing.c
+++ b/libs/libaom/src/av1/common/timing.c
diff --git a/media/libaom/src/av1/common/timing.h b/libs/libaom/src/av1/common/timing.h
index 9192124f7..9192124f7 100644
--- a/media/libaom/src/av1/common/timing.h
+++ b/libs/libaom/src/av1/common/timing.h
diff --git a/media/libaom/src/av1/common/token_cdfs.h b/libs/libaom/src/av1/common/token_cdfs.h
index f1edda58d..f1edda58d 100644
--- a/media/libaom/src/av1/common/token_cdfs.h
+++ b/libs/libaom/src/av1/common/token_cdfs.h
diff --git a/media/libaom/src/av1/common/txb_common.c b/libs/libaom/src/av1/common/txb_common.c
index 4eef319cd..4eef319cd 100644
--- a/media/libaom/src/av1/common/txb_common.c
+++ b/libs/libaom/src/av1/common/txb_common.c
diff --git a/media/libaom/src/av1/common/txb_common.h b/libs/libaom/src/av1/common/txb_common.h
index 5a62fa89b..5a62fa89b 100644
--- a/media/libaom/src/av1/common/txb_common.h
+++ b/libs/libaom/src/av1/common/txb_common.h
diff --git a/media/libaom/src/av1/common/warped_motion.c b/libs/libaom/src/av1/common/warped_motion.c
index 4e9fab9bd..4e9fab9bd 100644
--- a/media/libaom/src/av1/common/warped_motion.c
+++ b/libs/libaom/src/av1/common/warped_motion.c
diff --git a/media/libaom/src/av1/common/warped_motion.h b/libs/libaom/src/av1/common/warped_motion.h
index 14dc0fe47..14dc0fe47 100644
--- a/media/libaom/src/av1/common/warped_motion.h
+++ b/libs/libaom/src/av1/common/warped_motion.h
diff --git a/media/libaom/src/av1/common/x86/av1_convolve_horiz_rs_sse4.c b/libs/libaom/src/av1/common/x86/av1_convolve_horiz_rs_sse4.c
index 8aa14696f..8aa14696f 100644
--- a/media/libaom/src/av1/common/x86/av1_convolve_horiz_rs_sse4.c
+++ b/libs/libaom/src/av1/common/x86/av1_convolve_horiz_rs_sse4.c
diff --git a/media/libaom/src/av1/common/x86/av1_convolve_scale_sse4.c b/libs/libaom/src/av1/common/x86/av1_convolve_scale_sse4.c
index 196618176..196618176 100644
--- a/media/libaom/src/av1/common/x86/av1_convolve_scale_sse4.c
+++ b/libs/libaom/src/av1/common/x86/av1_convolve_scale_sse4.c
diff --git a/media/libaom/src/av1/common/x86/av1_inv_txfm_avx2.c b/libs/libaom/src/av1/common/x86/av1_inv_txfm_avx2.c
index 0fbd5eae4..0fbd5eae4 100644
--- a/media/libaom/src/av1/common/x86/av1_inv_txfm_avx2.c
+++ b/libs/libaom/src/av1/common/x86/av1_inv_txfm_avx2.c
diff --git a/media/libaom/src/av1/common/x86/av1_inv_txfm_avx2.h b/libs/libaom/src/av1/common/x86/av1_inv_txfm_avx2.h
index f74cbaeaa..f74cbaeaa 100644
--- a/media/libaom/src/av1/common/x86/av1_inv_txfm_avx2.h
+++ b/libs/libaom/src/av1/common/x86/av1_inv_txfm_avx2.h
diff --git a/media/libaom/src/av1/common/x86/av1_inv_txfm_ssse3.c b/libs/libaom/src/av1/common/x86/av1_inv_txfm_ssse3.c
index 46c051ff8..46c051ff8 100644
--- a/media/libaom/src/av1/common/x86/av1_inv_txfm_ssse3.c
+++ b/libs/libaom/src/av1/common/x86/av1_inv_txfm_ssse3.c
diff --git a/media/libaom/src/av1/common/x86/av1_inv_txfm_ssse3.h b/libs/libaom/src/av1/common/x86/av1_inv_txfm_ssse3.h
index 7d5055deb..7d5055deb 100644
--- a/media/libaom/src/av1/common/x86/av1_inv_txfm_ssse3.h
+++ b/libs/libaom/src/av1/common/x86/av1_inv_txfm_ssse3.h
diff --git a/media/libaom/src/av1/common/x86/av1_txfm_sse2.h b/libs/libaom/src/av1/common/x86/av1_txfm_sse2.h
index 77aeb6eb1..77aeb6eb1 100644
--- a/media/libaom/src/av1/common/x86/av1_txfm_sse2.h
+++ b/libs/libaom/src/av1/common/x86/av1_txfm_sse2.h
diff --git a/media/libaom/src/av1/common/x86/av1_txfm_sse4.c b/libs/libaom/src/av1/common/x86/av1_txfm_sse4.c
index 65ccd1952..65ccd1952 100644
--- a/media/libaom/src/av1/common/x86/av1_txfm_sse4.c
+++ b/libs/libaom/src/av1/common/x86/av1_txfm_sse4.c
diff --git a/media/libaom/src/av1/common/x86/av1_txfm_sse4.h b/libs/libaom/src/av1/common/x86/av1_txfm_sse4.h
index 6cad821b1..6cad821b1 100644
--- a/media/libaom/src/av1/common/x86/av1_txfm_sse4.h
+++ b/libs/libaom/src/av1/common/x86/av1_txfm_sse4.h
diff --git a/media/libaom/src/av1/common/x86/cfl_avx2.c b/libs/libaom/src/av1/common/x86/cfl_avx2.c
index d9c6f99d5..d9c6f99d5 100644
--- a/media/libaom/src/av1/common/x86/cfl_avx2.c
+++ b/libs/libaom/src/av1/common/x86/cfl_avx2.c
diff --git a/media/libaom/src/av1/common/x86/cfl_simd.h b/libs/libaom/src/av1/common/x86/cfl_simd.h
index 03ae02a92..03ae02a92 100644
--- a/media/libaom/src/av1/common/x86/cfl_simd.h
+++ b/libs/libaom/src/av1/common/x86/cfl_simd.h
diff --git a/media/libaom/src/av1/common/x86/cfl_sse2.c b/libs/libaom/src/av1/common/x86/cfl_sse2.c
index 4783fe098..4783fe098 100644
--- a/media/libaom/src/av1/common/x86/cfl_sse2.c
+++ b/libs/libaom/src/av1/common/x86/cfl_sse2.c
diff --git a/media/libaom/src/av1/common/x86/cfl_ssse3.c b/libs/libaom/src/av1/common/x86/cfl_ssse3.c
index 476b6609a..476b6609a 100644
--- a/media/libaom/src/av1/common/x86/cfl_ssse3.c
+++ b/libs/libaom/src/av1/common/x86/cfl_ssse3.c
diff --git a/media/libaom/src/av1/common/x86/convolve_2d_avx2.c b/libs/libaom/src/av1/common/x86/convolve_2d_avx2.c
index e19575d72..e19575d72 100644
--- a/media/libaom/src/av1/common/x86/convolve_2d_avx2.c
+++ b/libs/libaom/src/av1/common/x86/convolve_2d_avx2.c
diff --git a/media/libaom/src/av1/common/x86/convolve_2d_sse2.c b/libs/libaom/src/av1/common/x86/convolve_2d_sse2.c
index 5376ea79b..5376ea79b 100644
--- a/media/libaom/src/av1/common/x86/convolve_2d_sse2.c
+++ b/libs/libaom/src/av1/common/x86/convolve_2d_sse2.c
diff --git a/media/libaom/src/av1/common/x86/convolve_avx2.c b/libs/libaom/src/av1/common/x86/convolve_avx2.c
index 1d5bc6fbd..1d5bc6fbd 100644
--- a/media/libaom/src/av1/common/x86/convolve_avx2.c
+++ b/libs/libaom/src/av1/common/x86/convolve_avx2.c
diff --git a/media/libaom/src/av1/common/x86/convolve_sse2.c b/libs/libaom/src/av1/common/x86/convolve_sse2.c
index 4323ac4d1..4323ac4d1 100644
--- a/media/libaom/src/av1/common/x86/convolve_sse2.c
+++ b/libs/libaom/src/av1/common/x86/convolve_sse2.c
diff --git a/media/libaom/src/av1/common/x86/filterintra_sse4.c b/libs/libaom/src/av1/common/x86/filterintra_sse4.c
index 99f4d9967..99f4d9967 100644
--- a/media/libaom/src/av1/common/x86/filterintra_sse4.c
+++ b/libs/libaom/src/av1/common/x86/filterintra_sse4.c
diff --git a/media/libaom/src/av1/common/x86/highbd_convolve_2d_avx2.c b/libs/libaom/src/av1/common/x86/highbd_convolve_2d_avx2.c
index 396aed01b..396aed01b 100644
--- a/media/libaom/src/av1/common/x86/highbd_convolve_2d_avx2.c
+++ b/libs/libaom/src/av1/common/x86/highbd_convolve_2d_avx2.c
diff --git a/media/libaom/src/av1/common/x86/highbd_convolve_2d_sse2.c b/libs/libaom/src/av1/common/x86/highbd_convolve_2d_sse2.c
index f758775ee..f758775ee 100644
--- a/media/libaom/src/av1/common/x86/highbd_convolve_2d_sse2.c
+++ b/libs/libaom/src/av1/common/x86/highbd_convolve_2d_sse2.c
diff --git a/media/libaom/src/av1/common/x86/highbd_convolve_2d_sse4.c b/libs/libaom/src/av1/common/x86/highbd_convolve_2d_sse4.c
index d2ff47c1f..d2ff47c1f 100644
--- a/media/libaom/src/av1/common/x86/highbd_convolve_2d_sse4.c
+++ b/libs/libaom/src/av1/common/x86/highbd_convolve_2d_sse4.c
diff --git a/media/libaom/src/av1/common/x86/highbd_convolve_2d_ssse3.c b/libs/libaom/src/av1/common/x86/highbd_convolve_2d_ssse3.c
index 5318fcaa8..5318fcaa8 100644
--- a/media/libaom/src/av1/common/x86/highbd_convolve_2d_ssse3.c
+++ b/libs/libaom/src/av1/common/x86/highbd_convolve_2d_ssse3.c
diff --git a/media/libaom/src/av1/common/x86/highbd_inv_txfm_avx2.c b/libs/libaom/src/av1/common/x86/highbd_inv_txfm_avx2.c
index 93e98e4b3..93e98e4b3 100644
--- a/media/libaom/src/av1/common/x86/highbd_inv_txfm_avx2.c
+++ b/libs/libaom/src/av1/common/x86/highbd_inv_txfm_avx2.c
diff --git a/media/libaom/src/av1/common/x86/highbd_inv_txfm_sse4.c b/libs/libaom/src/av1/common/x86/highbd_inv_txfm_sse4.c
index 03eaef832..03eaef832 100644
--- a/media/libaom/src/av1/common/x86/highbd_inv_txfm_sse4.c
+++ b/libs/libaom/src/av1/common/x86/highbd_inv_txfm_sse4.c
diff --git a/media/libaom/src/av1/common/x86/highbd_jnt_convolve_avx2.c b/libs/libaom/src/av1/common/x86/highbd_jnt_convolve_avx2.c
index 70f1ec709..70f1ec709 100644
--- a/media/libaom/src/av1/common/x86/highbd_jnt_convolve_avx2.c
+++ b/libs/libaom/src/av1/common/x86/highbd_jnt_convolve_avx2.c
diff --git a/media/libaom/src/av1/common/x86/highbd_jnt_convolve_sse4.c b/libs/libaom/src/av1/common/x86/highbd_jnt_convolve_sse4.c
index f033a6f94..f033a6f94 100644
--- a/media/libaom/src/av1/common/x86/highbd_jnt_convolve_sse4.c
+++ b/libs/libaom/src/av1/common/x86/highbd_jnt_convolve_sse4.c
diff --git a/media/libaom/src/av1/common/x86/highbd_txfm_utility_sse4.h b/libs/libaom/src/av1/common/x86/highbd_txfm_utility_sse4.h
index 5734810f5..5734810f5 100644
--- a/media/libaom/src/av1/common/x86/highbd_txfm_utility_sse4.h
+++ b/libs/libaom/src/av1/common/x86/highbd_txfm_utility_sse4.h
diff --git a/media/libaom/src/av1/common/x86/highbd_warp_plane_sse4.c b/libs/libaom/src/av1/common/x86/highbd_warp_plane_sse4.c
index 60a819308..60a819308 100644
--- a/media/libaom/src/av1/common/x86/highbd_warp_plane_sse4.c
+++ b/libs/libaom/src/av1/common/x86/highbd_warp_plane_sse4.c
diff --git a/media/libaom/src/av1/common/x86/highbd_wiener_convolve_avx2.c b/libs/libaom/src/av1/common/x86/highbd_wiener_convolve_avx2.c
index 0c8a8505b..0c8a8505b 100644
--- a/media/libaom/src/av1/common/x86/highbd_wiener_convolve_avx2.c
+++ b/libs/libaom/src/av1/common/x86/highbd_wiener_convolve_avx2.c
diff --git a/media/libaom/src/av1/common/x86/highbd_wiener_convolve_ssse3.c b/libs/libaom/src/av1/common/x86/highbd_wiener_convolve_ssse3.c
index 818b1099c..818b1099c 100644
--- a/media/libaom/src/av1/common/x86/highbd_wiener_convolve_ssse3.c
+++ b/libs/libaom/src/av1/common/x86/highbd_wiener_convolve_ssse3.c
diff --git a/media/libaom/src/av1/common/x86/intra_edge_sse4.c b/libs/libaom/src/av1/common/x86/intra_edge_sse4.c
index fc69f41d7..fc69f41d7 100644
--- a/media/libaom/src/av1/common/x86/intra_edge_sse4.c
+++ b/libs/libaom/src/av1/common/x86/intra_edge_sse4.c
diff --git a/media/libaom/src/av1/common/x86/jnt_convolve_avx2.c b/libs/libaom/src/av1/common/x86/jnt_convolve_avx2.c
index 6de61573e..6de61573e 100644
--- a/media/libaom/src/av1/common/x86/jnt_convolve_avx2.c
+++ b/libs/libaom/src/av1/common/x86/jnt_convolve_avx2.c
diff --git a/media/libaom/src/av1/common/x86/jnt_convolve_sse2.c b/libs/libaom/src/av1/common/x86/jnt_convolve_sse2.c
index f8f640a11..f8f640a11 100644
--- a/media/libaom/src/av1/common/x86/jnt_convolve_sse2.c
+++ b/libs/libaom/src/av1/common/x86/jnt_convolve_sse2.c
diff --git a/media/libaom/src/av1/common/x86/jnt_convolve_ssse3.c b/libs/libaom/src/av1/common/x86/jnt_convolve_ssse3.c
index f45e3b267..f45e3b267 100644
--- a/media/libaom/src/av1/common/x86/jnt_convolve_ssse3.c
+++ b/libs/libaom/src/av1/common/x86/jnt_convolve_ssse3.c
diff --git a/media/libaom/src/av1/common/x86/reconinter_avx2.c b/libs/libaom/src/av1/common/x86/reconinter_avx2.c
index a38bd8317..a38bd8317 100644
--- a/media/libaom/src/av1/common/x86/reconinter_avx2.c
+++ b/libs/libaom/src/av1/common/x86/reconinter_avx2.c
diff --git a/media/libaom/src/av1/common/x86/reconinter_sse4.c b/libs/libaom/src/av1/common/x86/reconinter_sse4.c
index 5171ca493..5171ca493 100644
--- a/media/libaom/src/av1/common/x86/reconinter_sse4.c
+++ b/libs/libaom/src/av1/common/x86/reconinter_sse4.c
diff --git a/media/libaom/src/av1/common/x86/reconinter_ssse3.c b/libs/libaom/src/av1/common/x86/reconinter_ssse3.c
index cf684447c..cf684447c 100644
--- a/media/libaom/src/av1/common/x86/reconinter_ssse3.c
+++ b/libs/libaom/src/av1/common/x86/reconinter_ssse3.c
diff --git a/media/libaom/src/av1/common/x86/selfguided_avx2.c b/libs/libaom/src/av1/common/x86/selfguided_avx2.c
index 3c5558dda..3c5558dda 100644
--- a/media/libaom/src/av1/common/x86/selfguided_avx2.c
+++ b/libs/libaom/src/av1/common/x86/selfguided_avx2.c
diff --git a/media/libaom/src/av1/common/x86/selfguided_sse4.c b/libs/libaom/src/av1/common/x86/selfguided_sse4.c
index 72c7708f1..72c7708f1 100644
--- a/media/libaom/src/av1/common/x86/selfguided_sse4.c
+++ b/libs/libaom/src/av1/common/x86/selfguided_sse4.c
diff --git a/media/libaom/src/av1/common/x86/warp_plane_avx2.c b/libs/libaom/src/av1/common/x86/warp_plane_avx2.c
index 53a928d76..53a928d76 100644
--- a/media/libaom/src/av1/common/x86/warp_plane_avx2.c
+++ b/libs/libaom/src/av1/common/x86/warp_plane_avx2.c
diff --git a/media/libaom/src/av1/common/x86/warp_plane_sse2.c b/libs/libaom/src/av1/common/x86/warp_plane_sse2.c
index 6ff666518..6ff666518 100644
--- a/media/libaom/src/av1/common/x86/warp_plane_sse2.c
+++ b/libs/libaom/src/av1/common/x86/warp_plane_sse2.c
diff --git a/media/libaom/src/av1/common/x86/warp_plane_sse4.c b/libs/libaom/src/av1/common/x86/warp_plane_sse4.c
index 10ddf92d0..10ddf92d0 100644
--- a/media/libaom/src/av1/common/x86/warp_plane_sse4.c
+++ b/libs/libaom/src/av1/common/x86/warp_plane_sse4.c
diff --git a/media/libaom/src/av1/common/x86/wiener_convolve_avx2.c b/libs/libaom/src/av1/common/x86/wiener_convolve_avx2.c
index b7ac68383..b7ac68383 100644
--- a/media/libaom/src/av1/common/x86/wiener_convolve_avx2.c
+++ b/libs/libaom/src/av1/common/x86/wiener_convolve_avx2.c
diff --git a/media/libaom/src/av1/common/x86/wiener_convolve_sse2.c b/libs/libaom/src/av1/common/x86/wiener_convolve_sse2.c
index f9d00b733..f9d00b733 100644
--- a/media/libaom/src/av1/common/x86/wiener_convolve_sse2.c
+++ b/libs/libaom/src/av1/common/x86/wiener_convolve_sse2.c
diff --git a/media/libaom/src/av1/decoder/accounting.c b/libs/libaom/src/av1/decoder/accounting.c
index 2e58d09e0..2e58d09e0 100644
--- a/media/libaom/src/av1/decoder/accounting.c
+++ b/libs/libaom/src/av1/decoder/accounting.c
diff --git a/media/libaom/src/av1/decoder/accounting.h b/libs/libaom/src/av1/decoder/accounting.h
index ad2e8b6cf..ad2e8b6cf 100644
--- a/media/libaom/src/av1/decoder/accounting.h
+++ b/libs/libaom/src/av1/decoder/accounting.h
diff --git a/media/libaom/src/av1/decoder/decodeframe.c b/libs/libaom/src/av1/decoder/decodeframe.c
index 7abfac4aa..7abfac4aa 100644
--- a/media/libaom/src/av1/decoder/decodeframe.c
+++ b/libs/libaom/src/av1/decoder/decodeframe.c
diff --git a/media/libaom/src/av1/decoder/decodeframe.h b/libs/libaom/src/av1/decoder/decodeframe.h
index 95b3c9f22..95b3c9f22 100644
--- a/media/libaom/src/av1/decoder/decodeframe.h
+++ b/libs/libaom/src/av1/decoder/decodeframe.h
diff --git a/media/libaom/src/av1/decoder/decodemv.c b/libs/libaom/src/av1/decoder/decodemv.c
index e97cec42c..e97cec42c 100644
--- a/media/libaom/src/av1/decoder/decodemv.c
+++ b/libs/libaom/src/av1/decoder/decodemv.c
diff --git a/media/libaom/src/av1/decoder/decodemv.h b/libs/libaom/src/av1/decoder/decodemv.h
index 289e66ae1..289e66ae1 100644
--- a/media/libaom/src/av1/decoder/decodemv.h
+++ b/libs/libaom/src/av1/decoder/decodemv.h
diff --git a/media/libaom/src/av1/decoder/decoder.c b/libs/libaom/src/av1/decoder/decoder.c
index fc5f2cd20..fc5f2cd20 100644
--- a/media/libaom/src/av1/decoder/decoder.c
+++ b/libs/libaom/src/av1/decoder/decoder.c
diff --git a/media/libaom/src/av1/decoder/decoder.h b/libs/libaom/src/av1/decoder/decoder.h
index 4580de2ac..4580de2ac 100644
--- a/media/libaom/src/av1/decoder/decoder.h
+++ b/libs/libaom/src/av1/decoder/decoder.h
diff --git a/media/libaom/src/av1/decoder/decodetxb.c b/libs/libaom/src/av1/decoder/decodetxb.c
index 541f4c984..541f4c984 100644
--- a/media/libaom/src/av1/decoder/decodetxb.c
+++ b/libs/libaom/src/av1/decoder/decodetxb.c
diff --git a/media/libaom/src/av1/decoder/decodetxb.h b/libs/libaom/src/av1/decoder/decodetxb.h
index 39bf0bf78..39bf0bf78 100644
--- a/media/libaom/src/av1/decoder/decodetxb.h
+++ b/libs/libaom/src/av1/decoder/decodetxb.h
diff --git a/media/libaom/src/av1/decoder/detokenize.c b/libs/libaom/src/av1/decoder/detokenize.c
index 9d54bd13d..9d54bd13d 100644
--- a/media/libaom/src/av1/decoder/detokenize.c
+++ b/libs/libaom/src/av1/decoder/detokenize.c
diff --git a/media/libaom/src/av1/decoder/detokenize.h b/libs/libaom/src/av1/decoder/detokenize.h
index 173b437a9..173b437a9 100644
--- a/media/libaom/src/av1/decoder/detokenize.h
+++ b/libs/libaom/src/av1/decoder/detokenize.h
diff --git a/media/libaom/src/av1/decoder/dthread.h b/libs/libaom/src/av1/decoder/dthread.h
index f82b9d8cc..f82b9d8cc 100644
--- a/media/libaom/src/av1/decoder/dthread.h
+++ b/libs/libaom/src/av1/decoder/dthread.h
diff --git a/media/libaom/src/av1/decoder/inspection.c b/libs/libaom/src/av1/decoder/inspection.c
index d121a7034..d121a7034 100644
--- a/media/libaom/src/av1/decoder/inspection.c
+++ b/libs/libaom/src/av1/decoder/inspection.c
diff --git a/media/libaom/src/av1/decoder/inspection.h b/libs/libaom/src/av1/decoder/inspection.h
index b963f6ac6..b963f6ac6 100644
--- a/media/libaom/src/av1/decoder/inspection.h
+++ b/libs/libaom/src/av1/decoder/inspection.h
diff --git a/media/libaom/src/av1/decoder/obu.c b/libs/libaom/src/av1/decoder/obu.c
index 791e5965b..791e5965b 100644
--- a/media/libaom/src/av1/decoder/obu.c
+++ b/libs/libaom/src/av1/decoder/obu.c
diff --git a/media/libaom/src/av1/decoder/obu.h b/libs/libaom/src/av1/decoder/obu.h
index d8ebe368e..d8ebe368e 100644
--- a/media/libaom/src/av1/decoder/obu.h
+++ b/libs/libaom/src/av1/decoder/obu.h
diff --git a/media/libaom/src/av1/encoder/aq_complexity.c b/libs/libaom/src/av1/encoder/aq_complexity.c
index 36580063d..36580063d 100644
--- a/media/libaom/src/av1/encoder/aq_complexity.c
+++ b/libs/libaom/src/av1/encoder/aq_complexity.c
diff --git a/media/libaom/src/av1/encoder/aq_complexity.h b/libs/libaom/src/av1/encoder/aq_complexity.h
index 3421d74c9..3421d74c9 100644
--- a/media/libaom/src/av1/encoder/aq_complexity.h
+++ b/libs/libaom/src/av1/encoder/aq_complexity.h
diff --git a/media/libaom/src/av1/encoder/aq_cyclicrefresh.c b/libs/libaom/src/av1/encoder/aq_cyclicrefresh.c
index b8884942a..b8884942a 100644
--- a/media/libaom/src/av1/encoder/aq_cyclicrefresh.c
+++ b/libs/libaom/src/av1/encoder/aq_cyclicrefresh.c
diff --git a/media/libaom/src/av1/encoder/aq_cyclicrefresh.h b/libs/libaom/src/av1/encoder/aq_cyclicrefresh.h
index ee62f6aaa..ee62f6aaa 100644
--- a/media/libaom/src/av1/encoder/aq_cyclicrefresh.h
+++ b/libs/libaom/src/av1/encoder/aq_cyclicrefresh.h
diff --git a/media/libaom/src/av1/encoder/aq_variance.c b/libs/libaom/src/av1/encoder/aq_variance.c
index 4176da292..4176da292 100644
--- a/media/libaom/src/av1/encoder/aq_variance.c
+++ b/libs/libaom/src/av1/encoder/aq_variance.c
diff --git a/media/libaom/src/av1/encoder/aq_variance.h b/libs/libaom/src/av1/encoder/aq_variance.h
index 543eb0b51..543eb0b51 100644
--- a/media/libaom/src/av1/encoder/aq_variance.h
+++ b/libs/libaom/src/av1/encoder/aq_variance.h
diff --git a/media/libaom/src/av1/encoder/arm/neon/av1_error_neon.c b/libs/libaom/src/av1/encoder/arm/neon/av1_error_neon.c
index 22da1a8d6..22da1a8d6 100644
--- a/media/libaom/src/av1/encoder/arm/neon/av1_error_neon.c
+++ b/libs/libaom/src/av1/encoder/arm/neon/av1_error_neon.c
diff --git a/media/libaom/src/av1/encoder/arm/neon/quantize_neon.c b/libs/libaom/src/av1/encoder/arm/neon/quantize_neon.c
index c2f50a217..c2f50a217 100644
--- a/media/libaom/src/av1/encoder/arm/neon/quantize_neon.c
+++ b/libs/libaom/src/av1/encoder/arm/neon/quantize_neon.c
diff --git a/media/libaom/src/av1/encoder/av1_fwd_txfm1d.c b/libs/libaom/src/av1/encoder/av1_fwd_txfm1d.c
index 6601c19ab..6601c19ab 100644
--- a/media/libaom/src/av1/encoder/av1_fwd_txfm1d.c
+++ b/libs/libaom/src/av1/encoder/av1_fwd_txfm1d.c
diff --git a/media/libaom/src/av1/encoder/av1_fwd_txfm1d.h b/libs/libaom/src/av1/encoder/av1_fwd_txfm1d.h
index 9ef54fe4d..9ef54fe4d 100644
--- a/media/libaom/src/av1/encoder/av1_fwd_txfm1d.h
+++ b/libs/libaom/src/av1/encoder/av1_fwd_txfm1d.h
diff --git a/media/libaom/src/av1/encoder/av1_fwd_txfm1d_cfg.h b/libs/libaom/src/av1/encoder/av1_fwd_txfm1d_cfg.h
index 2777cc25b..2777cc25b 100644
--- a/media/libaom/src/av1/encoder/av1_fwd_txfm1d_cfg.h
+++ b/libs/libaom/src/av1/encoder/av1_fwd_txfm1d_cfg.h
diff --git a/media/libaom/src/av1/encoder/av1_fwd_txfm2d.c b/libs/libaom/src/av1/encoder/av1_fwd_txfm2d.c
index bcb829d79..bcb829d79 100644
--- a/media/libaom/src/av1/encoder/av1_fwd_txfm2d.c
+++ b/libs/libaom/src/av1/encoder/av1_fwd_txfm2d.c
diff --git a/media/libaom/src/av1/encoder/av1_multi_thread.c b/libs/libaom/src/av1/encoder/av1_multi_thread.c
index d170b0c28..d170b0c28 100644
--- a/media/libaom/src/av1/encoder/av1_multi_thread.c
+++ b/libs/libaom/src/av1/encoder/av1_multi_thread.c
diff --git a/media/libaom/src/av1/encoder/av1_multi_thread.h b/libs/libaom/src/av1/encoder/av1_multi_thread.h
index 2a1cc7d6d..2a1cc7d6d 100644
--- a/media/libaom/src/av1/encoder/av1_multi_thread.h
+++ b/libs/libaom/src/av1/encoder/av1_multi_thread.h
diff --git a/media/libaom/src/av1/encoder/av1_quantize.c b/libs/libaom/src/av1/encoder/av1_quantize.c
index 569784a2a..569784a2a 100644
--- a/media/libaom/src/av1/encoder/av1_quantize.c
+++ b/libs/libaom/src/av1/encoder/av1_quantize.c
diff --git a/media/libaom/src/av1/encoder/av1_quantize.h b/libs/libaom/src/av1/encoder/av1_quantize.h
index 40fb4bee8..40fb4bee8 100644
--- a/media/libaom/src/av1/encoder/av1_quantize.h
+++ b/libs/libaom/src/av1/encoder/av1_quantize.h
diff --git a/media/libaom/src/av1/encoder/bitstream.c b/libs/libaom/src/av1/encoder/bitstream.c
index daa8ce1fc..daa8ce1fc 100644
--- a/media/libaom/src/av1/encoder/bitstream.c
+++ b/libs/libaom/src/av1/encoder/bitstream.c
diff --git a/media/libaom/src/av1/encoder/bitstream.h b/libs/libaom/src/av1/encoder/bitstream.h
index 45151e25e..45151e25e 100644
--- a/media/libaom/src/av1/encoder/bitstream.h
+++ b/libs/libaom/src/av1/encoder/bitstream.h
diff --git a/media/libaom/src/av1/encoder/block.h b/libs/libaom/src/av1/encoder/block.h
index 5a74567a4..5a74567a4 100644
--- a/media/libaom/src/av1/encoder/block.h
+++ b/libs/libaom/src/av1/encoder/block.h
diff --git a/media/libaom/src/av1/encoder/blockiness.c b/libs/libaom/src/av1/encoder/blockiness.c
index f7cff9e53..f7cff9e53 100644
--- a/media/libaom/src/av1/encoder/blockiness.c
+++ b/libs/libaom/src/av1/encoder/blockiness.c
diff --git a/media/libaom/src/av1/encoder/cnn.c b/libs/libaom/src/av1/encoder/cnn.c
index 5d8a236a0..5d8a236a0 100644
--- a/media/libaom/src/av1/encoder/cnn.c
+++ b/libs/libaom/src/av1/encoder/cnn.c
diff --git a/media/libaom/src/av1/encoder/cnn.h b/libs/libaom/src/av1/encoder/cnn.h
index 706be4447..706be4447 100644
--- a/media/libaom/src/av1/encoder/cnn.h
+++ b/libs/libaom/src/av1/encoder/cnn.h
diff --git a/media/libaom/src/av1/encoder/compound_type.c b/libs/libaom/src/av1/encoder/compound_type.c
index 42095b79e..42095b79e 100644
--- a/media/libaom/src/av1/encoder/compound_type.c
+++ b/libs/libaom/src/av1/encoder/compound_type.c
diff --git a/media/libaom/src/av1/encoder/compound_type.h b/libs/libaom/src/av1/encoder/compound_type.h
index f2bd857c9..f2bd857c9 100644
--- a/media/libaom/src/av1/encoder/compound_type.h
+++ b/libs/libaom/src/av1/encoder/compound_type.h
diff --git a/media/libaom/src/av1/encoder/context_tree.c b/libs/libaom/src/av1/encoder/context_tree.c
index 9b5b1cbf9..9b5b1cbf9 100644
--- a/media/libaom/src/av1/encoder/context_tree.c
+++ b/libs/libaom/src/av1/encoder/context_tree.c
diff --git a/media/libaom/src/av1/encoder/context_tree.h b/libs/libaom/src/av1/encoder/context_tree.h
index a39979413..a39979413 100644
--- a/media/libaom/src/av1/encoder/context_tree.h
+++ b/libs/libaom/src/av1/encoder/context_tree.h
diff --git a/media/libaom/src/av1/encoder/corner_detect.c b/libs/libaom/src/av1/encoder/corner_detect.c
index 597bb30fc..597bb30fc 100644
--- a/media/libaom/src/av1/encoder/corner_detect.c
+++ b/libs/libaom/src/av1/encoder/corner_detect.c
diff --git a/media/libaom/src/av1/encoder/corner_detect.h b/libs/libaom/src/av1/encoder/corner_detect.h
index 15062f265..15062f265 100644
--- a/media/libaom/src/av1/encoder/corner_detect.h
+++ b/libs/libaom/src/av1/encoder/corner_detect.h
diff --git a/media/libaom/src/av1/encoder/corner_match.c b/libs/libaom/src/av1/encoder/corner_match.c
index 12f633b4f..12f633b4f 100644
--- a/media/libaom/src/av1/encoder/corner_match.c
+++ b/libs/libaom/src/av1/encoder/corner_match.c
diff --git a/media/libaom/src/av1/encoder/corner_match.h b/libs/libaom/src/av1/encoder/corner_match.h
index 3cf6de159..3cf6de159 100644
--- a/media/libaom/src/av1/encoder/corner_match.h
+++ b/libs/libaom/src/av1/encoder/corner_match.h
diff --git a/media/libaom/src/av1/encoder/cost.c b/libs/libaom/src/av1/encoder/cost.c
index 323e2aed5..323e2aed5 100644
--- a/media/libaom/src/av1/encoder/cost.c
+++ b/libs/libaom/src/av1/encoder/cost.c
diff --git a/media/libaom/src/av1/encoder/cost.h b/libs/libaom/src/av1/encoder/cost.h
index be0241a82..be0241a82 100644
--- a/media/libaom/src/av1/encoder/cost.h
+++ b/libs/libaom/src/av1/encoder/cost.h
diff --git a/media/libaom/src/av1/encoder/dwt.c b/libs/libaom/src/av1/encoder/dwt.c
index 04088b25f..04088b25f 100644
--- a/media/libaom/src/av1/encoder/dwt.c
+++ b/libs/libaom/src/av1/encoder/dwt.c
diff --git a/media/libaom/src/av1/encoder/dwt.h b/libs/libaom/src/av1/encoder/dwt.h
index 37306c6a5..37306c6a5 100644
--- a/media/libaom/src/av1/encoder/dwt.h
+++ b/libs/libaom/src/av1/encoder/dwt.h
diff --git a/media/libaom/src/av1/encoder/enc_enums.h b/libs/libaom/src/av1/encoder/enc_enums.h
index 5a0651483..5a0651483 100644
--- a/media/libaom/src/av1/encoder/enc_enums.h
+++ b/libs/libaom/src/av1/encoder/enc_enums.h
diff --git a/media/libaom/src/av1/encoder/encode_strategy.c b/libs/libaom/src/av1/encoder/encode_strategy.c
index 8eb73d8d3..8eb73d8d3 100644
--- a/media/libaom/src/av1/encoder/encode_strategy.c
+++ b/libs/libaom/src/av1/encoder/encode_strategy.c
diff --git a/media/libaom/src/av1/encoder/encode_strategy.h b/libs/libaom/src/av1/encoder/encode_strategy.h
index b05224ba1..b05224ba1 100644
--- a/media/libaom/src/av1/encoder/encode_strategy.h
+++ b/libs/libaom/src/av1/encoder/encode_strategy.h
diff --git a/media/libaom/src/av1/encoder/encodeframe.c b/libs/libaom/src/av1/encoder/encodeframe.c
index 53b47d49e..53b47d49e 100644
--- a/media/libaom/src/av1/encoder/encodeframe.c
+++ b/libs/libaom/src/av1/encoder/encodeframe.c
diff --git a/media/libaom/src/av1/encoder/encodeframe.h b/libs/libaom/src/av1/encoder/encodeframe.h
index e4c484105..e4c484105 100644
--- a/media/libaom/src/av1/encoder/encodeframe.h
+++ b/libs/libaom/src/av1/encoder/encodeframe.h
diff --git a/media/libaom/src/av1/encoder/encodemb.c b/libs/libaom/src/av1/encoder/encodemb.c
index ec3336229..ec3336229 100644
--- a/media/libaom/src/av1/encoder/encodemb.c
+++ b/libs/libaom/src/av1/encoder/encodemb.c
diff --git a/media/libaom/src/av1/encoder/encodemb.h b/libs/libaom/src/av1/encoder/encodemb.h
index a337c83db..a337c83db 100644
--- a/media/libaom/src/av1/encoder/encodemb.h
+++ b/libs/libaom/src/av1/encoder/encodemb.h
diff --git a/media/libaom/src/av1/encoder/encodemv.c b/libs/libaom/src/av1/encoder/encodemv.c
index 167e9c0a3..167e9c0a3 100644
--- a/media/libaom/src/av1/encoder/encodemv.c
+++ b/libs/libaom/src/av1/encoder/encodemv.c
diff --git a/media/libaom/src/av1/encoder/encodemv.h b/libs/libaom/src/av1/encoder/encodemv.h
index 0d130143e..0d130143e 100644
--- a/media/libaom/src/av1/encoder/encodemv.h
+++ b/libs/libaom/src/av1/encoder/encodemv.h
diff --git a/media/libaom/src/av1/encoder/encoder.c b/libs/libaom/src/av1/encoder/encoder.c
index 6406afd4a..6406afd4a 100644
--- a/media/libaom/src/av1/encoder/encoder.c
+++ b/libs/libaom/src/av1/encoder/encoder.c
diff --git a/media/libaom/src/av1/encoder/encoder.h b/libs/libaom/src/av1/encoder/encoder.h
index 82d00cb76..82d00cb76 100644
--- a/media/libaom/src/av1/encoder/encoder.h
+++ b/libs/libaom/src/av1/encoder/encoder.h
diff --git a/media/libaom/src/av1/encoder/encodetxb.c b/libs/libaom/src/av1/encoder/encodetxb.c
index 825d52a7a..825d52a7a 100644
--- a/media/libaom/src/av1/encoder/encodetxb.c
+++ b/libs/libaom/src/av1/encoder/encodetxb.c
diff --git a/media/libaom/src/av1/encoder/encodetxb.h b/libs/libaom/src/av1/encoder/encodetxb.h
index 7122895d1..7122895d1 100644
--- a/media/libaom/src/av1/encoder/encodetxb.h
+++ b/libs/libaom/src/av1/encoder/encodetxb.h
diff --git a/media/libaom/src/av1/encoder/ethread.c b/libs/libaom/src/av1/encoder/ethread.c
index 693270b87..693270b87 100644
--- a/media/libaom/src/av1/encoder/ethread.c
+++ b/libs/libaom/src/av1/encoder/ethread.c
diff --git a/media/libaom/src/av1/encoder/ethread.h b/libs/libaom/src/av1/encoder/ethread.h
index 183075950..183075950 100644
--- a/media/libaom/src/av1/encoder/ethread.h
+++ b/libs/libaom/src/av1/encoder/ethread.h
diff --git a/media/libaom/src/av1/encoder/extend.c b/libs/libaom/src/av1/encoder/extend.c
index 934cf5644..934cf5644 100644
--- a/media/libaom/src/av1/encoder/extend.c
+++ b/libs/libaom/src/av1/encoder/extend.c
diff --git a/media/libaom/src/av1/encoder/extend.h b/libs/libaom/src/av1/encoder/extend.h
index b8cc5b9d2..b8cc5b9d2 100644
--- a/media/libaom/src/av1/encoder/extend.h
+++ b/libs/libaom/src/av1/encoder/extend.h
diff --git a/media/libaom/src/av1/encoder/firstpass.c b/libs/libaom/src/av1/encoder/firstpass.c
index 0955510ca..0955510ca 100644
--- a/media/libaom/src/av1/encoder/firstpass.c
+++ b/libs/libaom/src/av1/encoder/firstpass.c
diff --git a/media/libaom/src/av1/encoder/firstpass.h b/libs/libaom/src/av1/encoder/firstpass.h
index 99d444539..99d444539 100644
--- a/media/libaom/src/av1/encoder/firstpass.h
+++ b/libs/libaom/src/av1/encoder/firstpass.h
diff --git a/media/libaom/src/av1/encoder/global_motion.c b/libs/libaom/src/av1/encoder/global_motion.c
index 9623ec301..9623ec301 100644
--- a/media/libaom/src/av1/encoder/global_motion.c
+++ b/libs/libaom/src/av1/encoder/global_motion.c
diff --git a/media/libaom/src/av1/encoder/global_motion.h b/libs/libaom/src/av1/encoder/global_motion.h
index 0a6d0ecac..0a6d0ecac 100644
--- a/media/libaom/src/av1/encoder/global_motion.h
+++ b/libs/libaom/src/av1/encoder/global_motion.h
diff --git a/media/libaom/src/av1/encoder/gop_structure.c b/libs/libaom/src/av1/encoder/gop_structure.c
index 1ed71a0f9..1ed71a0f9 100644
--- a/media/libaom/src/av1/encoder/gop_structure.c
+++ b/libs/libaom/src/av1/encoder/gop_structure.c
diff --git a/media/libaom/src/av1/encoder/gop_structure.h b/libs/libaom/src/av1/encoder/gop_structure.h
index 0c775c7b4..0c775c7b4 100644
--- a/media/libaom/src/av1/encoder/gop_structure.h
+++ b/libs/libaom/src/av1/encoder/gop_structure.h
diff --git a/media/libaom/src/av1/encoder/grain_test_vectors.h b/libs/libaom/src/av1/encoder/grain_test_vectors.h
index 945dc3733..945dc3733 100644
--- a/media/libaom/src/av1/encoder/grain_test_vectors.h
+++ b/libs/libaom/src/av1/encoder/grain_test_vectors.h
diff --git a/media/libaom/src/av1/encoder/hash.c b/libs/libaom/src/av1/encoder/hash.c
index 3091037eb..3091037eb 100644
--- a/media/libaom/src/av1/encoder/hash.c
+++ b/libs/libaom/src/av1/encoder/hash.c
diff --git a/media/libaom/src/av1/encoder/hash.h b/libs/libaom/src/av1/encoder/hash.h
index d8e8cc3a0..d8e8cc3a0 100644
--- a/media/libaom/src/av1/encoder/hash.h
+++ b/libs/libaom/src/av1/encoder/hash.h
diff --git a/media/libaom/src/av1/encoder/hash_motion.c b/libs/libaom/src/av1/encoder/hash_motion.c
index 310cde886..310cde886 100644
--- a/media/libaom/src/av1/encoder/hash_motion.c
+++ b/libs/libaom/src/av1/encoder/hash_motion.c
diff --git a/media/libaom/src/av1/encoder/hash_motion.h b/libs/libaom/src/av1/encoder/hash_motion.h
index e4ea1f394..e4ea1f394 100644
--- a/media/libaom/src/av1/encoder/hash_motion.h
+++ b/libs/libaom/src/av1/encoder/hash_motion.h
diff --git a/media/libaom/src/av1/encoder/hybrid_fwd_txfm.c b/libs/libaom/src/av1/encoder/hybrid_fwd_txfm.c
index 06990857a..06990857a 100644
--- a/media/libaom/src/av1/encoder/hybrid_fwd_txfm.c
+++ b/libs/libaom/src/av1/encoder/hybrid_fwd_txfm.c
diff --git a/media/libaom/src/av1/encoder/hybrid_fwd_txfm.h b/libs/libaom/src/av1/encoder/hybrid_fwd_txfm.h
index daabc7119..daabc7119 100644
--- a/media/libaom/src/av1/encoder/hybrid_fwd_txfm.h
+++ b/libs/libaom/src/av1/encoder/hybrid_fwd_txfm.h
diff --git a/media/libaom/src/av1/encoder/interp_search.c b/libs/libaom/src/av1/encoder/interp_search.c
index 6b7317be7..6b7317be7 100644
--- a/media/libaom/src/av1/encoder/interp_search.c
+++ b/libs/libaom/src/av1/encoder/interp_search.c
diff --git a/media/libaom/src/av1/encoder/interp_search.h b/libs/libaom/src/av1/encoder/interp_search.h
index 401e14f5b..401e14f5b 100644
--- a/media/libaom/src/av1/encoder/interp_search.h
+++ b/libs/libaom/src/av1/encoder/interp_search.h
diff --git a/media/libaom/src/av1/encoder/intra_mode_search.c b/libs/libaom/src/av1/encoder/intra_mode_search.c
index 43192a945..43192a945 100644
--- a/media/libaom/src/av1/encoder/intra_mode_search.c
+++ b/libs/libaom/src/av1/encoder/intra_mode_search.c
diff --git a/media/libaom/src/av1/encoder/intra_mode_search.h b/libs/libaom/src/av1/encoder/intra_mode_search.h
index 4b5d31c3e..4b5d31c3e 100644
--- a/media/libaom/src/av1/encoder/intra_mode_search.h
+++ b/libs/libaom/src/av1/encoder/intra_mode_search.h
diff --git a/media/libaom/src/av1/encoder/k_means_template.h b/libs/libaom/src/av1/encoder/k_means_template.h
index 9e526b88b..9e526b88b 100644
--- a/media/libaom/src/av1/encoder/k_means_template.h
+++ b/libs/libaom/src/av1/encoder/k_means_template.h
diff --git a/media/libaom/src/av1/encoder/level.c b/libs/libaom/src/av1/encoder/level.c
index 3403a3a84..3403a3a84 100644
--- a/media/libaom/src/av1/encoder/level.c
+++ b/libs/libaom/src/av1/encoder/level.c
diff --git a/media/libaom/src/av1/encoder/level.h b/libs/libaom/src/av1/encoder/level.h
index 5e0cce200..5e0cce200 100644
--- a/media/libaom/src/av1/encoder/level.h
+++ b/libs/libaom/src/av1/encoder/level.h
diff --git a/media/libaom/src/av1/encoder/lookahead.c b/libs/libaom/src/av1/encoder/lookahead.c
index 0f7c81989..0f7c81989 100644
--- a/media/libaom/src/av1/encoder/lookahead.c
+++ b/libs/libaom/src/av1/encoder/lookahead.c
diff --git a/media/libaom/src/av1/encoder/lookahead.h b/libs/libaom/src/av1/encoder/lookahead.h
index 03693d383..03693d383 100644
--- a/media/libaom/src/av1/encoder/lookahead.h
+++ b/libs/libaom/src/av1/encoder/lookahead.h
diff --git a/media/libaom/src/av1/encoder/mathutils.h b/libs/libaom/src/av1/encoder/mathutils.h
index 64f936176..64f936176 100644
--- a/media/libaom/src/av1/encoder/mathutils.h
+++ b/libs/libaom/src/av1/encoder/mathutils.h
diff --git a/media/libaom/src/av1/encoder/mcomp.c b/libs/libaom/src/av1/encoder/mcomp.c
index 43f7f5c6c..43f7f5c6c 100644
--- a/media/libaom/src/av1/encoder/mcomp.c
+++ b/libs/libaom/src/av1/encoder/mcomp.c
diff --git a/media/libaom/src/av1/encoder/mcomp.h b/libs/libaom/src/av1/encoder/mcomp.h
index 73135d859..73135d859 100644
--- a/media/libaom/src/av1/encoder/mcomp.h
+++ b/libs/libaom/src/av1/encoder/mcomp.h
diff --git a/media/libaom/src/av1/encoder/mips/msa/error_msa.c b/libs/libaom/src/av1/encoder/mips/msa/error_msa.c
index 2e86dee43..2e86dee43 100644
--- a/media/libaom/src/av1/encoder/mips/msa/error_msa.c
+++ b/libs/libaom/src/av1/encoder/mips/msa/error_msa.c
diff --git a/media/libaom/src/av1/encoder/mips/msa/fdct4x4_msa.c b/libs/libaom/src/av1/encoder/mips/msa/fdct4x4_msa.c
index 085c08bfb..085c08bfb 100644
--- a/media/libaom/src/av1/encoder/mips/msa/fdct4x4_msa.c
+++ b/libs/libaom/src/av1/encoder/mips/msa/fdct4x4_msa.c
diff --git a/media/libaom/src/av1/encoder/mips/msa/temporal_filter_msa.c b/libs/libaom/src/av1/encoder/mips/msa/temporal_filter_msa.c
index effa75b83..effa75b83 100644
--- a/media/libaom/src/av1/encoder/mips/msa/temporal_filter_msa.c
+++ b/libs/libaom/src/av1/encoder/mips/msa/temporal_filter_msa.c
diff --git a/media/libaom/src/av1/encoder/misc_model_weights.h b/libs/libaom/src/av1/encoder/misc_model_weights.h
index f00aeabcf..f00aeabcf 100644
--- a/media/libaom/src/av1/encoder/misc_model_weights.h
+++ b/libs/libaom/src/av1/encoder/misc_model_weights.h
diff --git a/media/libaom/src/av1/encoder/ml.c b/libs/libaom/src/av1/encoder/ml.c
index 57228ec91..57228ec91 100644
--- a/media/libaom/src/av1/encoder/ml.c
+++ b/libs/libaom/src/av1/encoder/ml.c
diff --git a/media/libaom/src/av1/encoder/ml.h b/libs/libaom/src/av1/encoder/ml.h
index 62d543d6b..62d543d6b 100644
--- a/media/libaom/src/av1/encoder/ml.h
+++ b/libs/libaom/src/av1/encoder/ml.h
diff --git a/media/libaom/src/av1/encoder/mode_prune_model_weights.h b/libs/libaom/src/av1/encoder/mode_prune_model_weights.h
index 98ec36808..98ec36808 100644
--- a/media/libaom/src/av1/encoder/mode_prune_model_weights.h
+++ b/libs/libaom/src/av1/encoder/mode_prune_model_weights.h
diff --git a/media/libaom/src/av1/encoder/model_rd.h b/libs/libaom/src/av1/encoder/model_rd.h
index c353c8f85..c353c8f85 100644
--- a/media/libaom/src/av1/encoder/model_rd.h
+++ b/libs/libaom/src/av1/encoder/model_rd.h
diff --git a/media/libaom/src/av1/encoder/motion_search_facade.c b/libs/libaom/src/av1/encoder/motion_search_facade.c
index 8db1423e7..8db1423e7 100644
--- a/media/libaom/src/av1/encoder/motion_search_facade.c
+++ b/libs/libaom/src/av1/encoder/motion_search_facade.c
diff --git a/media/libaom/src/av1/encoder/motion_search_facade.h b/libs/libaom/src/av1/encoder/motion_search_facade.h
index 3b86e9376..3b86e9376 100644
--- a/media/libaom/src/av1/encoder/motion_search_facade.h
+++ b/libs/libaom/src/av1/encoder/motion_search_facade.h
diff --git a/media/libaom/src/av1/encoder/mv_prec.c b/libs/libaom/src/av1/encoder/mv_prec.c
index 8fcbde98e..8fcbde98e 100644
--- a/media/libaom/src/av1/encoder/mv_prec.c
+++ b/libs/libaom/src/av1/encoder/mv_prec.c
diff --git a/media/libaom/src/av1/encoder/mv_prec.h b/libs/libaom/src/av1/encoder/mv_prec.h
index 8df8b96dc..8df8b96dc 100644
--- a/media/libaom/src/av1/encoder/mv_prec.h
+++ b/libs/libaom/src/av1/encoder/mv_prec.h
diff --git a/media/libaom/src/av1/encoder/nonrd_pickmode.c b/libs/libaom/src/av1/encoder/nonrd_pickmode.c
index a1180015c..a1180015c 100644
--- a/media/libaom/src/av1/encoder/nonrd_pickmode.c
+++ b/libs/libaom/src/av1/encoder/nonrd_pickmode.c
diff --git a/media/libaom/src/av1/encoder/palette.c b/libs/libaom/src/av1/encoder/palette.c
index e61cd02ce..e61cd02ce 100644
--- a/media/libaom/src/av1/encoder/palette.c
+++ b/libs/libaom/src/av1/encoder/palette.c
diff --git a/media/libaom/src/av1/encoder/palette.h b/libs/libaom/src/av1/encoder/palette.h
index 8b88c4755..8b88c4755 100644
--- a/media/libaom/src/av1/encoder/palette.h
+++ b/libs/libaom/src/av1/encoder/palette.h
diff --git a/media/libaom/src/av1/encoder/partition_cnn_weights.h b/libs/libaom/src/av1/encoder/partition_cnn_weights.h
index 504038c63..504038c63 100644
--- a/media/libaom/src/av1/encoder/partition_cnn_weights.h
+++ b/libs/libaom/src/av1/encoder/partition_cnn_weights.h
diff --git a/media/libaom/src/av1/encoder/partition_model_weights.h b/libs/libaom/src/av1/encoder/partition_model_weights.h
index 71c1ace78..71c1ace78 100644
--- a/media/libaom/src/av1/encoder/partition_model_weights.h
+++ b/libs/libaom/src/av1/encoder/partition_model_weights.h
diff --git a/media/libaom/src/av1/encoder/partition_strategy.c b/libs/libaom/src/av1/encoder/partition_strategy.c
index cc820ba24..cc820ba24 100644
--- a/media/libaom/src/av1/encoder/partition_strategy.c
+++ b/libs/libaom/src/av1/encoder/partition_strategy.c
diff --git a/media/libaom/src/av1/encoder/partition_strategy.h b/libs/libaom/src/av1/encoder/partition_strategy.h
index f9b4d8bfd..f9b4d8bfd 100644
--- a/media/libaom/src/av1/encoder/partition_strategy.h
+++ b/libs/libaom/src/av1/encoder/partition_strategy.h
diff --git a/media/libaom/src/av1/encoder/pass2_strategy.c b/libs/libaom/src/av1/encoder/pass2_strategy.c
index 6adc1fbf9..6adc1fbf9 100644
--- a/media/libaom/src/av1/encoder/pass2_strategy.c
+++ b/libs/libaom/src/av1/encoder/pass2_strategy.c
diff --git a/media/libaom/src/av1/encoder/pass2_strategy.h b/libs/libaom/src/av1/encoder/pass2_strategy.h
index 437fb8f79..437fb8f79 100644
--- a/media/libaom/src/av1/encoder/pass2_strategy.h
+++ b/libs/libaom/src/av1/encoder/pass2_strategy.h
diff --git a/media/libaom/src/av1/encoder/pickcdef.c b/libs/libaom/src/av1/encoder/pickcdef.c
index a1092fd59..a1092fd59 100644
--- a/media/libaom/src/av1/encoder/pickcdef.c
+++ b/libs/libaom/src/av1/encoder/pickcdef.c
diff --git a/media/libaom/src/av1/encoder/picklpf.c b/libs/libaom/src/av1/encoder/picklpf.c
index 17c996551..17c996551 100644
--- a/media/libaom/src/av1/encoder/picklpf.c
+++ b/libs/libaom/src/av1/encoder/picklpf.c
diff --git a/media/libaom/src/av1/encoder/picklpf.h b/libs/libaom/src/av1/encoder/picklpf.h
index 357097ae1..357097ae1 100644
--- a/media/libaom/src/av1/encoder/picklpf.h
+++ b/libs/libaom/src/av1/encoder/picklpf.h
diff --git a/media/libaom/src/av1/encoder/pickrst.c b/libs/libaom/src/av1/encoder/pickrst.c
index ccbe1cc3e..ccbe1cc3e 100644
--- a/media/libaom/src/av1/encoder/pickrst.c
+++ b/libs/libaom/src/av1/encoder/pickrst.c
diff --git a/media/libaom/src/av1/encoder/pickrst.h b/libs/libaom/src/av1/encoder/pickrst.h
index eee30553d..eee30553d 100644
--- a/media/libaom/src/av1/encoder/pickrst.h
+++ b/libs/libaom/src/av1/encoder/pickrst.h
diff --git a/media/libaom/src/av1/encoder/pustats.h b/libs/libaom/src/av1/encoder/pustats.h
index 2e8710108..2e8710108 100644
--- a/media/libaom/src/av1/encoder/pustats.h
+++ b/libs/libaom/src/av1/encoder/pustats.h
diff --git a/media/libaom/src/av1/encoder/random.h b/libs/libaom/src/av1/encoder/random.h
index 0bca39102..0bca39102 100644
--- a/media/libaom/src/av1/encoder/random.h
+++ b/libs/libaom/src/av1/encoder/random.h
diff --git a/media/libaom/src/av1/encoder/ransac.c b/libs/libaom/src/av1/encoder/ransac.c
index 07e1a5f5f..07e1a5f5f 100644
--- a/media/libaom/src/av1/encoder/ransac.c
+++ b/libs/libaom/src/av1/encoder/ransac.c
diff --git a/media/libaom/src/av1/encoder/ransac.h b/libs/libaom/src/av1/encoder/ransac.h
index 583d97152..583d97152 100644
--- a/media/libaom/src/av1/encoder/ransac.h
+++ b/libs/libaom/src/av1/encoder/ransac.h
diff --git a/media/libaom/src/av1/encoder/ratectrl.c b/libs/libaom/src/av1/encoder/ratectrl.c
index 433163f2e..433163f2e 100644
--- a/media/libaom/src/av1/encoder/ratectrl.c
+++ b/libs/libaom/src/av1/encoder/ratectrl.c
diff --git a/media/libaom/src/av1/encoder/ratectrl.h b/libs/libaom/src/av1/encoder/ratectrl.h
index c46378663..c46378663 100644
--- a/media/libaom/src/av1/encoder/ratectrl.h
+++ b/libs/libaom/src/av1/encoder/ratectrl.h
diff --git a/media/libaom/src/av1/encoder/rd.c b/libs/libaom/src/av1/encoder/rd.c
index e48c77119..e48c77119 100644
--- a/media/libaom/src/av1/encoder/rd.c
+++ b/libs/libaom/src/av1/encoder/rd.c
diff --git a/media/libaom/src/av1/encoder/rd.h b/libs/libaom/src/av1/encoder/rd.h
index 1addbaeb9..1addbaeb9 100644
--- a/media/libaom/src/av1/encoder/rd.h
+++ b/libs/libaom/src/av1/encoder/rd.h
diff --git a/media/libaom/src/av1/encoder/rdopt.c b/libs/libaom/src/av1/encoder/rdopt.c
index 02afcd1ff..02afcd1ff 100644
--- a/media/libaom/src/av1/encoder/rdopt.c
+++ b/libs/libaom/src/av1/encoder/rdopt.c
diff --git a/media/libaom/src/av1/encoder/rdopt.h b/libs/libaom/src/av1/encoder/rdopt.h
index c7c99ac4b..c7c99ac4b 100644
--- a/media/libaom/src/av1/encoder/rdopt.h
+++ b/libs/libaom/src/av1/encoder/rdopt.h
diff --git a/media/libaom/src/av1/encoder/rdopt_data_defs.h b/libs/libaom/src/av1/encoder/rdopt_data_defs.h
index ca7ef810f..ca7ef810f 100644
--- a/media/libaom/src/av1/encoder/rdopt_data_defs.h
+++ b/libs/libaom/src/av1/encoder/rdopt_data_defs.h
diff --git a/media/libaom/src/av1/encoder/rdopt_utils.h b/libs/libaom/src/av1/encoder/rdopt_utils.h
index 53b410a22..53b410a22 100644
--- a/media/libaom/src/av1/encoder/rdopt_utils.h
+++ b/libs/libaom/src/av1/encoder/rdopt_utils.h
diff --git a/media/libaom/src/av1/encoder/reconinter_enc.c b/libs/libaom/src/av1/encoder/reconinter_enc.c
index 231b02091..231b02091 100644
--- a/media/libaom/src/av1/encoder/reconinter_enc.c
+++ b/libs/libaom/src/av1/encoder/reconinter_enc.c
diff --git a/media/libaom/src/av1/encoder/reconinter_enc.h b/libs/libaom/src/av1/encoder/reconinter_enc.h
index fdc1f31c8..fdc1f31c8 100644
--- a/media/libaom/src/av1/encoder/reconinter_enc.h
+++ b/libs/libaom/src/av1/encoder/reconinter_enc.h
diff --git a/media/libaom/src/av1/encoder/segmentation.c b/libs/libaom/src/av1/encoder/segmentation.c
index 0c029c0e6..0c029c0e6 100644
--- a/media/libaom/src/av1/encoder/segmentation.c
+++ b/libs/libaom/src/av1/encoder/segmentation.c
diff --git a/media/libaom/src/av1/encoder/segmentation.h b/libs/libaom/src/av1/encoder/segmentation.h
index 1ad13d66a..1ad13d66a 100644
--- a/media/libaom/src/av1/encoder/segmentation.h
+++ b/libs/libaom/src/av1/encoder/segmentation.h
diff --git a/media/libaom/src/av1/encoder/speed_features.c b/libs/libaom/src/av1/encoder/speed_features.c
index e03faeccc..e03faeccc 100644
--- a/media/libaom/src/av1/encoder/speed_features.c
+++ b/libs/libaom/src/av1/encoder/speed_features.c
diff --git a/media/libaom/src/av1/encoder/speed_features.h b/libs/libaom/src/av1/encoder/speed_features.h
index d12c3c02e..d12c3c02e 100644
--- a/media/libaom/src/av1/encoder/speed_features.h
+++ b/libs/libaom/src/av1/encoder/speed_features.h
diff --git a/media/libaom/src/av1/encoder/svc_layercontext.c b/libs/libaom/src/av1/encoder/svc_layercontext.c
index b72d8aa73..b72d8aa73 100644
--- a/media/libaom/src/av1/encoder/svc_layercontext.c
+++ b/libs/libaom/src/av1/encoder/svc_layercontext.c
diff --git a/media/libaom/src/av1/encoder/svc_layercontext.h b/libs/libaom/src/av1/encoder/svc_layercontext.h
index 7cb85a3c9..7cb85a3c9 100644
--- a/media/libaom/src/av1/encoder/svc_layercontext.h
+++ b/libs/libaom/src/av1/encoder/svc_layercontext.h
diff --git a/media/libaom/src/av1/encoder/temporal_filter.c b/libs/libaom/src/av1/encoder/temporal_filter.c
index a637df559..a637df559 100644
--- a/media/libaom/src/av1/encoder/temporal_filter.c
+++ b/libs/libaom/src/av1/encoder/temporal_filter.c
diff --git a/media/libaom/src/av1/encoder/temporal_filter.h b/libs/libaom/src/av1/encoder/temporal_filter.h
index 5a6bde259..5a6bde259 100644
--- a/media/libaom/src/av1/encoder/temporal_filter.h
+++ b/libs/libaom/src/av1/encoder/temporal_filter.h
diff --git a/media/libaom/src/av1/encoder/tokenize.c b/libs/libaom/src/av1/encoder/tokenize.c
index e67415349..e67415349 100644
--- a/media/libaom/src/av1/encoder/tokenize.c
+++ b/libs/libaom/src/av1/encoder/tokenize.c
diff --git a/media/libaom/src/av1/encoder/tokenize.h b/libs/libaom/src/av1/encoder/tokenize.h
index 52caacbae..52caacbae 100644
--- a/media/libaom/src/av1/encoder/tokenize.h
+++ b/libs/libaom/src/av1/encoder/tokenize.h
diff --git a/media/libaom/src/av1/encoder/tpl_model.c b/libs/libaom/src/av1/encoder/tpl_model.c
index 79b94f373..79b94f373 100644
--- a/media/libaom/src/av1/encoder/tpl_model.c
+++ b/libs/libaom/src/av1/encoder/tpl_model.c
diff --git a/media/libaom/src/av1/encoder/tpl_model.h b/libs/libaom/src/av1/encoder/tpl_model.h
index 11a61b649..11a61b649 100644
--- a/media/libaom/src/av1/encoder/tpl_model.h
+++ b/libs/libaom/src/av1/encoder/tpl_model.h
diff --git a/media/libaom/src/av1/encoder/tune_vmaf.c b/libs/libaom/src/av1/encoder/tune_vmaf.c
index 997f78e27..997f78e27 100644
--- a/media/libaom/src/av1/encoder/tune_vmaf.c
+++ b/libs/libaom/src/av1/encoder/tune_vmaf.c
diff --git a/media/libaom/src/av1/encoder/tune_vmaf.h b/libs/libaom/src/av1/encoder/tune_vmaf.h
index c4cf07224..c4cf07224 100644
--- a/media/libaom/src/av1/encoder/tune_vmaf.h
+++ b/libs/libaom/src/av1/encoder/tune_vmaf.h
diff --git a/media/libaom/src/av1/encoder/tx_prune_model_weights.h b/libs/libaom/src/av1/encoder/tx_prune_model_weights.h
index 76efe9382..76efe9382 100644
--- a/media/libaom/src/av1/encoder/tx_prune_model_weights.h
+++ b/libs/libaom/src/av1/encoder/tx_prune_model_weights.h
diff --git a/media/libaom/src/av1/encoder/tx_search.c b/libs/libaom/src/av1/encoder/tx_search.c
index 65b9a2472..65b9a2472 100644
--- a/media/libaom/src/av1/encoder/tx_search.c
+++ b/libs/libaom/src/av1/encoder/tx_search.c
diff --git a/media/libaom/src/av1/encoder/tx_search.h b/libs/libaom/src/av1/encoder/tx_search.h
index 82d56719d..82d56719d 100644
--- a/media/libaom/src/av1/encoder/tx_search.h
+++ b/libs/libaom/src/av1/encoder/tx_search.h
diff --git a/media/libaom/src/av1/encoder/use_flat_gop_model_params.h b/libs/libaom/src/av1/encoder/use_flat_gop_model_params.h
index cf0776644..cf0776644 100644
--- a/media/libaom/src/av1/encoder/use_flat_gop_model_params.h
+++ b/libs/libaom/src/av1/encoder/use_flat_gop_model_params.h
diff --git a/media/libaom/src/av1/encoder/var_based_part.c b/libs/libaom/src/av1/encoder/var_based_part.c
index e3cb1fa8f..e3cb1fa8f 100644
--- a/media/libaom/src/av1/encoder/var_based_part.c
+++ b/libs/libaom/src/av1/encoder/var_based_part.c
diff --git a/media/libaom/src/av1/encoder/var_based_part.h b/libs/libaom/src/av1/encoder/var_based_part.h
index a80e25c32..a80e25c32 100644
--- a/media/libaom/src/av1/encoder/var_based_part.h
+++ b/libs/libaom/src/av1/encoder/var_based_part.h
diff --git a/media/libaom/src/av1/encoder/wedge_utils.c b/libs/libaom/src/av1/encoder/wedge_utils.c
index 40670178d..40670178d 100644
--- a/media/libaom/src/av1/encoder/wedge_utils.c
+++ b/libs/libaom/src/av1/encoder/wedge_utils.c
diff --git a/media/libaom/src/av1/encoder/x86/av1_fwd_txfm1d_sse4.c b/libs/libaom/src/av1/encoder/x86/av1_fwd_txfm1d_sse4.c
index 62eaa3074..62eaa3074 100644
--- a/media/libaom/src/av1/encoder/x86/av1_fwd_txfm1d_sse4.c
+++ b/libs/libaom/src/av1/encoder/x86/av1_fwd_txfm1d_sse4.c
diff --git a/media/libaom/src/av1/encoder/x86/av1_fwd_txfm2d_avx2.c b/libs/libaom/src/av1/encoder/x86/av1_fwd_txfm2d_avx2.c
index 634d50bb2..634d50bb2 100644
--- a/media/libaom/src/av1/encoder/x86/av1_fwd_txfm2d_avx2.c
+++ b/libs/libaom/src/av1/encoder/x86/av1_fwd_txfm2d_avx2.c
diff --git a/media/libaom/src/av1/encoder/x86/av1_fwd_txfm2d_sse4.c b/libs/libaom/src/av1/encoder/x86/av1_fwd_txfm2d_sse4.c
index 0bc3fbc2d..0bc3fbc2d 100644
--- a/media/libaom/src/av1/encoder/x86/av1_fwd_txfm2d_sse4.c
+++ b/libs/libaom/src/av1/encoder/x86/av1_fwd_txfm2d_sse4.c
diff --git a/media/libaom/src/av1/encoder/x86/av1_fwd_txfm_avx2.h b/libs/libaom/src/av1/encoder/x86/av1_fwd_txfm_avx2.h
index aaad76e5a..aaad76e5a 100644
--- a/media/libaom/src/av1/encoder/x86/av1_fwd_txfm_avx2.h
+++ b/libs/libaom/src/av1/encoder/x86/av1_fwd_txfm_avx2.h
diff --git a/media/libaom/src/av1/encoder/x86/av1_fwd_txfm_sse2.c b/libs/libaom/src/av1/encoder/x86/av1_fwd_txfm_sse2.c
index 694e6131c..694e6131c 100644
--- a/media/libaom/src/av1/encoder/x86/av1_fwd_txfm_sse2.c
+++ b/libs/libaom/src/av1/encoder/x86/av1_fwd_txfm_sse2.c
diff --git a/media/libaom/src/av1/encoder/x86/av1_fwd_txfm_sse2.h b/libs/libaom/src/av1/encoder/x86/av1_fwd_txfm_sse2.h
index a0e32f538..a0e32f538 100644
--- a/media/libaom/src/av1/encoder/x86/av1_fwd_txfm_sse2.h
+++ b/libs/libaom/src/av1/encoder/x86/av1_fwd_txfm_sse2.h
diff --git a/media/libaom/src/av1/encoder/x86/av1_highbd_quantize_avx2.c b/libs/libaom/src/av1/encoder/x86/av1_highbd_quantize_avx2.c
index b58911fcb..b58911fcb 100644
--- a/media/libaom/src/av1/encoder/x86/av1_highbd_quantize_avx2.c
+++ b/libs/libaom/src/av1/encoder/x86/av1_highbd_quantize_avx2.c
diff --git a/media/libaom/src/av1/encoder/x86/av1_highbd_quantize_sse4.c b/libs/libaom/src/av1/encoder/x86/av1_highbd_quantize_sse4.c
index 40b3b460b..40b3b460b 100644
--- a/media/libaom/src/av1/encoder/x86/av1_highbd_quantize_sse4.c
+++ b/libs/libaom/src/av1/encoder/x86/av1_highbd_quantize_sse4.c
diff --git a/media/libaom/src/av1/encoder/x86/av1_quantize_avx2.c b/libs/libaom/src/av1/encoder/x86/av1_quantize_avx2.c
index f5f7ee115..f5f7ee115 100644
--- a/media/libaom/src/av1/encoder/x86/av1_quantize_avx2.c
+++ b/libs/libaom/src/av1/encoder/x86/av1_quantize_avx2.c
diff --git a/media/libaom/src/av1/encoder/x86/av1_quantize_sse2.c b/libs/libaom/src/av1/encoder/x86/av1_quantize_sse2.c
index 5497c7eb7..5497c7eb7 100644
--- a/media/libaom/src/av1/encoder/x86/av1_quantize_sse2.c
+++ b/libs/libaom/src/av1/encoder/x86/av1_quantize_sse2.c
diff --git a/media/libaom/src/av1/encoder/x86/av1_quantize_ssse3_x86_64.asm b/libs/libaom/src/av1/encoder/x86/av1_quantize_ssse3_x86_64.asm
index ad4ae274e..ad4ae274e 100644
--- a/media/libaom/src/av1/encoder/x86/av1_quantize_ssse3_x86_64.asm
+++ b/libs/libaom/src/av1/encoder/x86/av1_quantize_ssse3_x86_64.asm
diff --git a/media/libaom/src/av1/encoder/x86/av1_ssim_opt_x86_64.asm b/libs/libaom/src/av1/encoder/x86/av1_ssim_opt_x86_64.asm
index faa2a232a..faa2a232a 100644
--- a/media/libaom/src/av1/encoder/x86/av1_ssim_opt_x86_64.asm
+++ b/libs/libaom/src/av1/encoder/x86/av1_ssim_opt_x86_64.asm
diff --git a/media/libaom/src/av1/encoder/x86/av1_txfm1d_sse4.h b/libs/libaom/src/av1/encoder/x86/av1_txfm1d_sse4.h
index 7a0f32898..7a0f32898 100644
--- a/media/libaom/src/av1/encoder/x86/av1_txfm1d_sse4.h
+++ b/libs/libaom/src/av1/encoder/x86/av1_txfm1d_sse4.h
diff --git a/media/libaom/src/av1/encoder/x86/corner_match_avx2.c b/libs/libaom/src/av1/encoder/x86/corner_match_avx2.c
index 8d7eb3f03..8d7eb3f03 100644
--- a/media/libaom/src/av1/encoder/x86/corner_match_avx2.c
+++ b/libs/libaom/src/av1/encoder/x86/corner_match_avx2.c
diff --git a/media/libaom/src/av1/encoder/x86/corner_match_sse4.c b/libs/libaom/src/av1/encoder/x86/corner_match_sse4.c
index 5c9ca207e..5c9ca207e 100644
--- a/media/libaom/src/av1/encoder/x86/corner_match_sse4.c
+++ b/libs/libaom/src/av1/encoder/x86/corner_match_sse4.c
diff --git a/media/libaom/src/av1/encoder/x86/dct_sse2.asm b/libs/libaom/src/av1/encoder/x86/dct_sse2.asm
index b18554818..b18554818 100644
--- a/media/libaom/src/av1/encoder/x86/dct_sse2.asm
+++ b/libs/libaom/src/av1/encoder/x86/dct_sse2.asm
diff --git a/media/libaom/src/av1/encoder/x86/encodetxb_avx2.c b/libs/libaom/src/av1/encoder/x86/encodetxb_avx2.c
index 30a412909..30a412909 100644
--- a/media/libaom/src/av1/encoder/x86/encodetxb_avx2.c
+++ b/libs/libaom/src/av1/encoder/x86/encodetxb_avx2.c
diff --git a/media/libaom/src/av1/encoder/x86/encodetxb_sse2.c b/libs/libaom/src/av1/encoder/x86/encodetxb_sse2.c
index 394befb7b..394befb7b 100644
--- a/media/libaom/src/av1/encoder/x86/encodetxb_sse2.c
+++ b/libs/libaom/src/av1/encoder/x86/encodetxb_sse2.c
diff --git a/media/libaom/src/av1/encoder/x86/encodetxb_sse4.c b/libs/libaom/src/av1/encoder/x86/encodetxb_sse4.c
index aeb57f2cd..aeb57f2cd 100644
--- a/media/libaom/src/av1/encoder/x86/encodetxb_sse4.c
+++ b/libs/libaom/src/av1/encoder/x86/encodetxb_sse4.c
diff --git a/media/libaom/src/av1/encoder/x86/error_intrin_avx2.c b/libs/libaom/src/av1/encoder/x86/error_intrin_avx2.c
index 12dda3ad0..12dda3ad0 100644
--- a/media/libaom/src/av1/encoder/x86/error_intrin_avx2.c
+++ b/libs/libaom/src/av1/encoder/x86/error_intrin_avx2.c
diff --git a/media/libaom/src/av1/encoder/x86/error_sse2.asm b/libs/libaom/src/av1/encoder/x86/error_sse2.asm
index f4b496897..f4b496897 100644
--- a/media/libaom/src/av1/encoder/x86/error_sse2.asm
+++ b/libs/libaom/src/av1/encoder/x86/error_sse2.asm
diff --git a/media/libaom/src/av1/encoder/x86/hash_sse42.c b/libs/libaom/src/av1/encoder/x86/hash_sse42.c
index 65fa46311..65fa46311 100644
--- a/media/libaom/src/av1/encoder/x86/hash_sse42.c
+++ b/libs/libaom/src/av1/encoder/x86/hash_sse42.c
diff --git a/media/libaom/src/av1/encoder/x86/highbd_block_error_intrin_avx2.c b/libs/libaom/src/av1/encoder/x86/highbd_block_error_intrin_avx2.c
index ee3714d8a..ee3714d8a 100644
--- a/media/libaom/src/av1/encoder/x86/highbd_block_error_intrin_avx2.c
+++ b/libs/libaom/src/av1/encoder/x86/highbd_block_error_intrin_avx2.c
diff --git a/media/libaom/src/av1/encoder/x86/highbd_block_error_intrin_sse2.c b/libs/libaom/src/av1/encoder/x86/highbd_block_error_intrin_sse2.c
index 4579e4e4a..4579e4e4a 100644
--- a/media/libaom/src/av1/encoder/x86/highbd_block_error_intrin_sse2.c
+++ b/libs/libaom/src/av1/encoder/x86/highbd_block_error_intrin_sse2.c
diff --git a/media/libaom/src/av1/encoder/x86/highbd_fwd_txfm_avx2.c b/libs/libaom/src/av1/encoder/x86/highbd_fwd_txfm_avx2.c
index a81378cfe..a81378cfe 100644
--- a/media/libaom/src/av1/encoder/x86/highbd_fwd_txfm_avx2.c
+++ b/libs/libaom/src/av1/encoder/x86/highbd_fwd_txfm_avx2.c
diff --git a/media/libaom/src/av1/encoder/x86/highbd_fwd_txfm_sse4.c b/libs/libaom/src/av1/encoder/x86/highbd_fwd_txfm_sse4.c
index 73afc5d03..73afc5d03 100644
--- a/media/libaom/src/av1/encoder/x86/highbd_fwd_txfm_sse4.c
+++ b/libs/libaom/src/av1/encoder/x86/highbd_fwd_txfm_sse4.c
diff --git a/media/libaom/src/av1/encoder/x86/ml_sse3.c b/libs/libaom/src/av1/encoder/x86/ml_sse3.c
index 89b1e6a05..89b1e6a05 100644
--- a/media/libaom/src/av1/encoder/x86/ml_sse3.c
+++ b/libs/libaom/src/av1/encoder/x86/ml_sse3.c
diff --git a/media/libaom/src/av1/encoder/x86/pickrst_avx2.c b/libs/libaom/src/av1/encoder/x86/pickrst_avx2.c
index f8703a23c..f8703a23c 100644
--- a/media/libaom/src/av1/encoder/x86/pickrst_avx2.c
+++ b/libs/libaom/src/av1/encoder/x86/pickrst_avx2.c
diff --git a/media/libaom/src/av1/encoder/x86/pickrst_sse4.c b/libs/libaom/src/av1/encoder/x86/pickrst_sse4.c
index a2f65a50c..a2f65a50c 100644
--- a/media/libaom/src/av1/encoder/x86/pickrst_sse4.c
+++ b/libs/libaom/src/av1/encoder/x86/pickrst_sse4.c
diff --git a/media/libaom/src/av1/encoder/x86/rdopt_avx2.c b/libs/libaom/src/av1/encoder/x86/rdopt_avx2.c
index f588badc7..f588badc7 100644
--- a/media/libaom/src/av1/encoder/x86/rdopt_avx2.c
+++ b/libs/libaom/src/av1/encoder/x86/rdopt_avx2.c
diff --git a/media/libaom/src/av1/encoder/x86/rdopt_sse4.c b/libs/libaom/src/av1/encoder/x86/rdopt_sse4.c
index 67d94b4ca..67d94b4ca 100644
--- a/media/libaom/src/av1/encoder/x86/rdopt_sse4.c
+++ b/libs/libaom/src/av1/encoder/x86/rdopt_sse4.c
diff --git a/media/libaom/src/av1/encoder/x86/temporal_filter_avx2.c b/libs/libaom/src/av1/encoder/x86/temporal_filter_avx2.c
index 847f7283c..847f7283c 100644
--- a/media/libaom/src/av1/encoder/x86/temporal_filter_avx2.c
+++ b/libs/libaom/src/av1/encoder/x86/temporal_filter_avx2.c
diff --git a/media/libaom/src/av1/encoder/x86/temporal_filter_constants.h b/libs/libaom/src/av1/encoder/x86/temporal_filter_constants.h
index 7cd61d75e..7cd61d75e 100644
--- a/media/libaom/src/av1/encoder/x86/temporal_filter_constants.h
+++ b/libs/libaom/src/av1/encoder/x86/temporal_filter_constants.h
diff --git a/media/libaom/src/av1/encoder/x86/temporal_filter_sse2.c b/libs/libaom/src/av1/encoder/x86/temporal_filter_sse2.c
index 1722fac86..1722fac86 100644
--- a/media/libaom/src/av1/encoder/x86/temporal_filter_sse2.c
+++ b/libs/libaom/src/av1/encoder/x86/temporal_filter_sse2.c
diff --git a/media/libaom/src/av1/encoder/x86/temporal_filter_sse4.c b/libs/libaom/src/av1/encoder/x86/temporal_filter_sse4.c
index e3f9f5f27..e3f9f5f27 100644
--- a/media/libaom/src/av1/encoder/x86/temporal_filter_sse4.c
+++ b/libs/libaom/src/av1/encoder/x86/temporal_filter_sse4.c
diff --git a/media/libaom/src/av1/encoder/x86/wedge_utils_avx2.c b/libs/libaom/src/av1/encoder/x86/wedge_utils_avx2.c
index c06bad8f7..c06bad8f7 100644
--- a/media/libaom/src/av1/encoder/x86/wedge_utils_avx2.c
+++ b/libs/libaom/src/av1/encoder/x86/wedge_utils_avx2.c
diff --git a/media/libaom/src/av1/encoder/x86/wedge_utils_sse2.c b/libs/libaom/src/av1/encoder/x86/wedge_utils_sse2.c
index f3f4b8a75..f3f4b8a75 100644
--- a/media/libaom/src/av1/encoder/x86/wedge_utils_sse2.c
+++ b/libs/libaom/src/av1/encoder/x86/wedge_utils_sse2.c
diff --git a/media/libaom/src/av1/exports_com b/libs/libaom/src/av1/exports_com
index 5c8e0e09d..5c8e0e09d 100644
--- a/media/libaom/src/av1/exports_com
+++ b/libs/libaom/src/av1/exports_com
diff --git a/media/libaom/src/av1/exports_dec b/libs/libaom/src/av1/exports_dec
index daabf6766..daabf6766 100644
--- a/media/libaom/src/av1/exports_dec
+++ b/libs/libaom/src/av1/exports_dec
diff --git a/media/libaom/src/av1/exports_enc b/libs/libaom/src/av1/exports_enc
index dc4a9eae7..dc4a9eae7 100644
--- a/media/libaom/src/av1/exports_enc
+++ b/libs/libaom/src/av1/exports_enc
diff --git a/media/libaom/src/av1/exports_ident b/libs/libaom/src/av1/exports_ident
index b523a679d..b523a679d 100644
--- a/media/libaom/src/av1/exports_ident
+++ b/libs/libaom/src/av1/exports_ident
diff --git a/media/libaom/src/av1/exports_test b/libs/libaom/src/av1/exports_test
index dab377575..dab377575 100644
--- a/media/libaom/src/av1/exports_test
+++ b/libs/libaom/src/av1/exports_test
diff --git a/media/libaom/src/build/.gitattributes b/libs/libaom/src/build/.gitattributes
index 03db79bc0..03db79bc0 100644
--- a/media/libaom/src/build/.gitattributes
+++ b/libs/libaom/src/build/.gitattributes
diff --git a/media/libaom/src/build/cmake/aom_config.c.template b/libs/libaom/src/build/cmake/aom_config.c.template
index 62f0a10ab..62f0a10ab 100644
--- a/media/libaom/src/build/cmake/aom_config.c.template
+++ b/libs/libaom/src/build/cmake/aom_config.c.template
diff --git a/media/libaom/src/build/cmake/aom_config_defaults.cmake b/libs/libaom/src/build/cmake/aom_config_defaults.cmake
index f9e70eb24..f9e70eb24 100644
--- a/media/libaom/src/build/cmake/aom_config_defaults.cmake
+++ b/libs/libaom/src/build/cmake/aom_config_defaults.cmake
diff --git a/media/libaom/src/build/cmake/aom_configure.cmake b/libs/libaom/src/build/cmake/aom_configure.cmake
index 224a46587..224a46587 100644
--- a/media/libaom/src/build/cmake/aom_configure.cmake
+++ b/libs/libaom/src/build/cmake/aom_configure.cmake
diff --git a/media/libaom/src/build/cmake/aom_experiment_deps.cmake b/libs/libaom/src/build/cmake/aom_experiment_deps.cmake
index 2e3615791..2e3615791 100644
--- a/media/libaom/src/build/cmake/aom_experiment_deps.cmake
+++ b/libs/libaom/src/build/cmake/aom_experiment_deps.cmake
diff --git a/media/libaom/src/build/cmake/aom_install.cmake b/libs/libaom/src/build/cmake/aom_install.cmake
index cd40fe424..cd40fe424 100644
--- a/media/libaom/src/build/cmake/aom_install.cmake
+++ b/libs/libaom/src/build/cmake/aom_install.cmake
diff --git a/media/libaom/src/build/cmake/aom_optimization.cmake b/libs/libaom/src/build/cmake/aom_optimization.cmake
index d8b258f1e..d8b258f1e 100644
--- a/media/libaom/src/build/cmake/aom_optimization.cmake
+++ b/libs/libaom/src/build/cmake/aom_optimization.cmake
diff --git a/media/libaom/src/build/cmake/compiler_flags.cmake b/libs/libaom/src/build/cmake/compiler_flags.cmake
index 24484bcad..24484bcad 100644
--- a/media/libaom/src/build/cmake/compiler_flags.cmake
+++ b/libs/libaom/src/build/cmake/compiler_flags.cmake
diff --git a/media/libaom/src/build/cmake/compiler_tests.cmake b/libs/libaom/src/build/cmake/compiler_tests.cmake
index 040283225..040283225 100644
--- a/media/libaom/src/build/cmake/compiler_tests.cmake
+++ b/libs/libaom/src/build/cmake/compiler_tests.cmake
diff --git a/media/libaom/src/build/cmake/cpu.cmake b/libs/libaom/src/build/cmake/cpu.cmake
index ef2d7552b..ef2d7552b 100644
--- a/media/libaom/src/build/cmake/cpu.cmake
+++ b/libs/libaom/src/build/cmake/cpu.cmake
diff --git a/media/libaom/src/build/cmake/dist.cmake b/libs/libaom/src/build/cmake/dist.cmake
index 5b9fc95d4..5b9fc95d4 100644
--- a/media/libaom/src/build/cmake/dist.cmake
+++ b/libs/libaom/src/build/cmake/dist.cmake
diff --git a/media/libaom/src/build/cmake/exports.cmake b/libs/libaom/src/build/cmake/exports.cmake
index fa7842c9d..fa7842c9d 100644
--- a/media/libaom/src/build/cmake/exports.cmake
+++ b/libs/libaom/src/build/cmake/exports.cmake
diff --git a/media/libaom/src/build/cmake/exports_sources.cmake b/libs/libaom/src/build/cmake/exports_sources.cmake
index 46bf001d8..46bf001d8 100644
--- a/media/libaom/src/build/cmake/exports_sources.cmake
+++ b/libs/libaom/src/build/cmake/exports_sources.cmake
diff --git a/media/libaom/src/build/cmake/generate_aom_config_templates.cmake b/libs/libaom/src/build/cmake/generate_aom_config_templates.cmake
index 529daaf02..529daaf02 100644
--- a/media/libaom/src/build/cmake/generate_aom_config_templates.cmake
+++ b/libs/libaom/src/build/cmake/generate_aom_config_templates.cmake
diff --git a/media/libaom/src/build/cmake/generate_exports.cmake b/libs/libaom/src/build/cmake/generate_exports.cmake
index f1d15a0fa..f1d15a0fa 100644
--- a/media/libaom/src/build/cmake/generate_exports.cmake
+++ b/libs/libaom/src/build/cmake/generate_exports.cmake
diff --git a/media/libaom/src/build/cmake/ios-Info.plist b/libs/libaom/src/build/cmake/ios-Info.plist
index 300e3e310..300e3e310 100644
--- a/media/libaom/src/build/cmake/ios-Info.plist
+++ b/libs/libaom/src/build/cmake/ios-Info.plist
diff --git a/media/libaom/src/build/cmake/iosbuild.sh b/libs/libaom/src/build/cmake/iosbuild.sh
index 167ece200..167ece200 100644
--- a/media/libaom/src/build/cmake/iosbuild.sh
+++ b/libs/libaom/src/build/cmake/iosbuild.sh
diff --git a/media/libaom/src/build/cmake/msvc_runtime.cmake b/libs/libaom/src/build/cmake/msvc_runtime.cmake
index 9e4cbea43..9e4cbea43 100644
--- a/media/libaom/src/build/cmake/msvc_runtime.cmake
+++ b/libs/libaom/src/build/cmake/msvc_runtime.cmake
diff --git a/media/libaom/src/build/cmake/pkg_config.cmake b/libs/libaom/src/build/cmake/pkg_config.cmake
index c3914d79e..c3914d79e 100644
--- a/media/libaom/src/build/cmake/pkg_config.cmake
+++ b/libs/libaom/src/build/cmake/pkg_config.cmake
diff --git a/media/libaom/src/build/cmake/rtcd.pl b/libs/libaom/src/build/cmake/rtcd.pl
index dafccdca9..dafccdca9 100644
--- a/media/libaom/src/build/cmake/rtcd.pl
+++ b/libs/libaom/src/build/cmake/rtcd.pl
diff --git a/media/libaom/src/build/cmake/sanitizers.cmake b/libs/libaom/src/build/cmake/sanitizers.cmake
index bcb600ce4..bcb600ce4 100644
--- a/media/libaom/src/build/cmake/sanitizers.cmake
+++ b/libs/libaom/src/build/cmake/sanitizers.cmake
diff --git a/media/libaom/src/build/cmake/toolchains/arm-ios-common.cmake b/libs/libaom/src/build/cmake/toolchains/arm-ios-common.cmake
index 053e33a27..053e33a27 100644
--- a/media/libaom/src/build/cmake/toolchains/arm-ios-common.cmake
+++ b/libs/libaom/src/build/cmake/toolchains/arm-ios-common.cmake
diff --git a/media/libaom/src/build/cmake/toolchains/arm64-android-clang.cmake b/libs/libaom/src/build/cmake/toolchains/arm64-android-clang.cmake
index c13b1d96c..c13b1d96c 100644
--- a/media/libaom/src/build/cmake/toolchains/arm64-android-clang.cmake
+++ b/libs/libaom/src/build/cmake/toolchains/arm64-android-clang.cmake
diff --git a/media/libaom/src/build/cmake/toolchains/arm64-ios.cmake b/libs/libaom/src/build/cmake/toolchains/arm64-ios.cmake
index 6feb1090f..6feb1090f 100644
--- a/media/libaom/src/build/cmake/toolchains/arm64-ios.cmake
+++ b/libs/libaom/src/build/cmake/toolchains/arm64-ios.cmake
diff --git a/media/libaom/src/build/cmake/toolchains/arm64-linux-gcc.cmake b/libs/libaom/src/build/cmake/toolchains/arm64-linux-gcc.cmake
index a6c9543db..a6c9543db 100644
--- a/media/libaom/src/build/cmake/toolchains/arm64-linux-gcc.cmake
+++ b/libs/libaom/src/build/cmake/toolchains/arm64-linux-gcc.cmake
diff --git a/media/libaom/src/build/cmake/toolchains/arm64-mingw-gcc.cmake b/libs/libaom/src/build/cmake/toolchains/arm64-mingw-gcc.cmake
index a8e15cb31..a8e15cb31 100644
--- a/media/libaom/src/build/cmake/toolchains/arm64-mingw-gcc.cmake
+++ b/libs/libaom/src/build/cmake/toolchains/arm64-mingw-gcc.cmake
diff --git a/media/libaom/src/build/cmake/toolchains/armv7-ios.cmake b/libs/libaom/src/build/cmake/toolchains/armv7-ios.cmake
index 11f7e160d..11f7e160d 100644
--- a/media/libaom/src/build/cmake/toolchains/armv7-ios.cmake
+++ b/libs/libaom/src/build/cmake/toolchains/armv7-ios.cmake
diff --git a/media/libaom/src/build/cmake/toolchains/armv7-linux-gcc.cmake b/libs/libaom/src/build/cmake/toolchains/armv7-linux-gcc.cmake
index b898b4b78..b898b4b78 100644
--- a/media/libaom/src/build/cmake/toolchains/armv7-linux-gcc.cmake
+++ b/libs/libaom/src/build/cmake/toolchains/armv7-linux-gcc.cmake
diff --git a/media/libaom/src/build/cmake/toolchains/armv7-mingw-gcc.cmake b/libs/libaom/src/build/cmake/toolchains/armv7-mingw-gcc.cmake
index 2dc4b1882..2dc4b1882 100644
--- a/media/libaom/src/build/cmake/toolchains/armv7-mingw-gcc.cmake
+++ b/libs/libaom/src/build/cmake/toolchains/armv7-mingw-gcc.cmake
diff --git a/media/libaom/src/build/cmake/toolchains/armv7s-ios.cmake b/libs/libaom/src/build/cmake/toolchains/armv7s-ios.cmake
index faa2933cf..faa2933cf 100644
--- a/media/libaom/src/build/cmake/toolchains/armv7s-ios.cmake
+++ b/libs/libaom/src/build/cmake/toolchains/armv7s-ios.cmake
diff --git a/media/libaom/src/build/cmake/toolchains/ios-simulator-common.cmake b/libs/libaom/src/build/cmake/toolchains/ios-simulator-common.cmake
index 76e0bd140..76e0bd140 100644
--- a/media/libaom/src/build/cmake/toolchains/ios-simulator-common.cmake
+++ b/libs/libaom/src/build/cmake/toolchains/ios-simulator-common.cmake
diff --git a/media/libaom/src/build/cmake/toolchains/mips32-linux-gcc.cmake b/libs/libaom/src/build/cmake/toolchains/mips32-linux-gcc.cmake
index c644eec8c..c644eec8c 100644
--- a/media/libaom/src/build/cmake/toolchains/mips32-linux-gcc.cmake
+++ b/libs/libaom/src/build/cmake/toolchains/mips32-linux-gcc.cmake
diff --git a/media/libaom/src/build/cmake/toolchains/mips64-linux-gcc.cmake b/libs/libaom/src/build/cmake/toolchains/mips64-linux-gcc.cmake
index 442d91099..442d91099 100644
--- a/media/libaom/src/build/cmake/toolchains/mips64-linux-gcc.cmake
+++ b/libs/libaom/src/build/cmake/toolchains/mips64-linux-gcc.cmake
diff --git a/media/libaom/src/build/cmake/toolchains/ppc-linux-gcc.cmake b/libs/libaom/src/build/cmake/toolchains/ppc-linux-gcc.cmake
index 54db99bb4..54db99bb4 100644
--- a/media/libaom/src/build/cmake/toolchains/ppc-linux-gcc.cmake
+++ b/libs/libaom/src/build/cmake/toolchains/ppc-linux-gcc.cmake
diff --git a/media/libaom/src/build/cmake/toolchains/x86-ios-simulator.cmake b/libs/libaom/src/build/cmake/toolchains/x86-ios-simulator.cmake
index caacb8c38..caacb8c38 100644
--- a/media/libaom/src/build/cmake/toolchains/x86-ios-simulator.cmake
+++ b/libs/libaom/src/build/cmake/toolchains/x86-ios-simulator.cmake
diff --git a/media/libaom/src/build/cmake/toolchains/x86-linux.cmake b/libs/libaom/src/build/cmake/toolchains/x86-linux.cmake
index c2a700bfe..c2a700bfe 100644
--- a/media/libaom/src/build/cmake/toolchains/x86-linux.cmake
+++ b/libs/libaom/src/build/cmake/toolchains/x86-linux.cmake
diff --git a/media/libaom/src/build/cmake/toolchains/x86-macos.cmake b/libs/libaom/src/build/cmake/toolchains/x86-macos.cmake
index 095ef18e7..095ef18e7 100644
--- a/media/libaom/src/build/cmake/toolchains/x86-macos.cmake
+++ b/libs/libaom/src/build/cmake/toolchains/x86-macos.cmake
diff --git a/media/libaom/src/build/cmake/toolchains/x86-mingw-gcc.cmake b/libs/libaom/src/build/cmake/toolchains/x86-mingw-gcc.cmake
index 4839c9d45..4839c9d45 100644
--- a/media/libaom/src/build/cmake/toolchains/x86-mingw-gcc.cmake
+++ b/libs/libaom/src/build/cmake/toolchains/x86-mingw-gcc.cmake
diff --git a/media/libaom/src/build/cmake/toolchains/x86_64-ios-simulator.cmake b/libs/libaom/src/build/cmake/toolchains/x86_64-ios-simulator.cmake
index d4b40ed09..d4b40ed09 100644
--- a/media/libaom/src/build/cmake/toolchains/x86_64-ios-simulator.cmake
+++ b/libs/libaom/src/build/cmake/toolchains/x86_64-ios-simulator.cmake
diff --git a/media/libaom/src/build/cmake/toolchains/x86_64-mingw-gcc.cmake b/libs/libaom/src/build/cmake/toolchains/x86_64-mingw-gcc.cmake
index 4b2d28deb..4b2d28deb 100644
--- a/media/libaom/src/build/cmake/toolchains/x86_64-mingw-gcc.cmake
+++ b/libs/libaom/src/build/cmake/toolchains/x86_64-mingw-gcc.cmake
diff --git a/media/libaom/src/build/cmake/util.cmake b/libs/libaom/src/build/cmake/util.cmake
index 9b3da84dc..9b3da84dc 100644
--- a/media/libaom/src/build/cmake/util.cmake
+++ b/libs/libaom/src/build/cmake/util.cmake
diff --git a/media/libaom/src/build/cmake/version.cmake b/libs/libaom/src/build/cmake/version.cmake
index dd953a37a..dd953a37a 100644
--- a/media/libaom/src/build/cmake/version.cmake
+++ b/libs/libaom/src/build/cmake/version.cmake
diff --git a/media/libaom/src/build/cmake/version.pl b/libs/libaom/src/build/cmake/version.pl
index 7d23f2b27..7d23f2b27 100644
--- a/media/libaom/src/build/cmake/version.pl
+++ b/libs/libaom/src/build/cmake/version.pl
diff --git a/media/libaom/src/codereview.settings b/libs/libaom/src/codereview.settings
index 185e9344c..185e9344c 100644
--- a/media/libaom/src/codereview.settings
+++ b/libs/libaom/src/codereview.settings
diff --git a/media/libaom/src/common/args.c b/libs/libaom/src/common/args.c
index ec2a86353..ec2a86353 100644
--- a/media/libaom/src/common/args.c
+++ b/libs/libaom/src/common/args.c
diff --git a/media/libaom/src/common/args.h b/libs/libaom/src/common/args.h
index 286f7dd1a..286f7dd1a 100644
--- a/media/libaom/src/common/args.h
+++ b/libs/libaom/src/common/args.h
diff --git a/media/libaom/src/common/av1_config.c b/libs/libaom/src/common/av1_config.c
index 9f5b02015..9f5b02015 100644
--- a/media/libaom/src/common/av1_config.c
+++ b/libs/libaom/src/common/av1_config.c
diff --git a/media/libaom/src/common/av1_config.h b/libs/libaom/src/common/av1_config.h
index a15bedb30..a15bedb30 100644
--- a/media/libaom/src/common/av1_config.h
+++ b/libs/libaom/src/common/av1_config.h
diff --git a/media/libaom/src/common/ivfdec.c b/libs/libaom/src/common/ivfdec.c
index 80d73b04c..80d73b04c 100644
--- a/media/libaom/src/common/ivfdec.c
+++ b/libs/libaom/src/common/ivfdec.c
diff --git a/media/libaom/src/common/ivfdec.h b/libs/libaom/src/common/ivfdec.h
index dbc77331f..dbc77331f 100644
--- a/media/libaom/src/common/ivfdec.h
+++ b/libs/libaom/src/common/ivfdec.h
diff --git a/media/libaom/src/common/ivfenc.c b/libs/libaom/src/common/ivfenc.c
index 64715f4d7..64715f4d7 100644
--- a/media/libaom/src/common/ivfenc.c
+++ b/libs/libaom/src/common/ivfenc.c
diff --git a/media/libaom/src/common/ivfenc.h b/libs/libaom/src/common/ivfenc.h
index 8f6d947d4..8f6d947d4 100644
--- a/media/libaom/src/common/ivfenc.h
+++ b/libs/libaom/src/common/ivfenc.h
diff --git a/media/libaom/src/common/md5_utils.c b/libs/libaom/src/common/md5_utils.c
index b69e1cc72..b69e1cc72 100644
--- a/media/libaom/src/common/md5_utils.c
+++ b/libs/libaom/src/common/md5_utils.c
diff --git a/media/libaom/src/common/md5_utils.h b/libs/libaom/src/common/md5_utils.h
index 144fa3ad2..144fa3ad2 100644
--- a/media/libaom/src/common/md5_utils.h
+++ b/libs/libaom/src/common/md5_utils.h
diff --git a/media/libaom/src/common/obudec.c b/libs/libaom/src/common/obudec.c
index 650f9973b..650f9973b 100644
--- a/media/libaom/src/common/obudec.c
+++ b/libs/libaom/src/common/obudec.c
diff --git a/media/libaom/src/common/obudec.h b/libs/libaom/src/common/obudec.h
index b2adb1e3d..b2adb1e3d 100644
--- a/media/libaom/src/common/obudec.h
+++ b/libs/libaom/src/common/obudec.h
diff --git a/media/libaom/src/common/rawenc.c b/libs/libaom/src/common/rawenc.c
index b72132c2e..b72132c2e 100644
--- a/media/libaom/src/common/rawenc.c
+++ b/libs/libaom/src/common/rawenc.c
diff --git a/media/libaom/src/common/rawenc.h b/libs/libaom/src/common/rawenc.h
index cf5e00e6f..cf5e00e6f 100644
--- a/media/libaom/src/common/rawenc.h
+++ b/libs/libaom/src/common/rawenc.h
diff --git a/media/libaom/src/common/tools_common.c b/libs/libaom/src/common/tools_common.c
index 51c1c52a1..51c1c52a1 100644
--- a/media/libaom/src/common/tools_common.c
+++ b/libs/libaom/src/common/tools_common.c
diff --git a/media/libaom/src/common/tools_common.h b/libs/libaom/src/common/tools_common.h
index 1ed004521..1ed004521 100644
--- a/media/libaom/src/common/tools_common.h
+++ b/libs/libaom/src/common/tools_common.h
diff --git a/media/libaom/src/common/video_common.h b/libs/libaom/src/common/video_common.h
index bf95031be..bf95031be 100644
--- a/media/libaom/src/common/video_common.h
+++ b/libs/libaom/src/common/video_common.h
diff --git a/media/libaom/src/common/video_reader.c b/libs/libaom/src/common/video_reader.c
index 7b021bc40..7b021bc40 100644
--- a/media/libaom/src/common/video_reader.c
+++ b/libs/libaom/src/common/video_reader.c
diff --git a/media/libaom/src/common/video_reader.h b/libs/libaom/src/common/video_reader.h
index 9ab439e8a..9ab439e8a 100644
--- a/media/libaom/src/common/video_reader.h
+++ b/libs/libaom/src/common/video_reader.h
diff --git a/media/libaom/src/common/video_writer.c b/libs/libaom/src/common/video_writer.c
index 1d4328ae1..1d4328ae1 100644
--- a/media/libaom/src/common/video_writer.c
+++ b/libs/libaom/src/common/video_writer.c
diff --git a/media/libaom/src/common/video_writer.h b/libs/libaom/src/common/video_writer.h
index 8712d47a5..8712d47a5 100644
--- a/media/libaom/src/common/video_writer.h
+++ b/libs/libaom/src/common/video_writer.h
diff --git a/media/libaom/src/common/warnings.c b/libs/libaom/src/common/warnings.c
index 2facee252..2facee252 100644
--- a/media/libaom/src/common/warnings.c
+++ b/libs/libaom/src/common/warnings.c
diff --git a/media/libaom/src/common/warnings.h b/libs/libaom/src/common/warnings.h
index 36f1fe070..36f1fe070 100644
--- a/media/libaom/src/common/warnings.h
+++ b/libs/libaom/src/common/warnings.h
diff --git a/media/libaom/src/common/webmdec.cc b/libs/libaom/src/common/webmdec.cc
index 33bda5902..33bda5902 100644
--- a/media/libaom/src/common/webmdec.cc
+++ b/libs/libaom/src/common/webmdec.cc
diff --git a/media/libaom/src/common/webmdec.h b/libs/libaom/src/common/webmdec.h
index 5ac75cb30..5ac75cb30 100644
--- a/media/libaom/src/common/webmdec.h
+++ b/libs/libaom/src/common/webmdec.h
diff --git a/media/libaom/src/common/webmenc.cc b/libs/libaom/src/common/webmenc.cc
index 6ae7df646..6ae7df646 100644
--- a/media/libaom/src/common/webmenc.cc
+++ b/libs/libaom/src/common/webmenc.cc
diff --git a/media/libaom/src/common/webmenc.h b/libs/libaom/src/common/webmenc.h
index a4aa992b0..a4aa992b0 100644
--- a/media/libaom/src/common/webmenc.h
+++ b/libs/libaom/src/common/webmenc.h
diff --git a/media/libaom/src/common/y4menc.c b/libs/libaom/src/common/y4menc.c
index e3f5d5b38..e3f5d5b38 100644
--- a/media/libaom/src/common/y4menc.c
+++ b/libs/libaom/src/common/y4menc.c
diff --git a/media/libaom/src/common/y4menc.h b/libs/libaom/src/common/y4menc.h
index f6d5fd86b..f6d5fd86b 100644
--- a/media/libaom/src/common/y4menc.h
+++ b/libs/libaom/src/common/y4menc.h
diff --git a/media/libaom/src/common/y4minput.c b/libs/libaom/src/common/y4minput.c
index f3dfaafc6..f3dfaafc6 100644
--- a/media/libaom/src/common/y4minput.c
+++ b/libs/libaom/src/common/y4minput.c
diff --git a/media/libaom/src/common/y4minput.h b/libs/libaom/src/common/y4minput.h
index f6c5a3d3a..f6c5a3d3a 100644
--- a/media/libaom/src/common/y4minput.h
+++ b/libs/libaom/src/common/y4minput.h
diff --git a/media/libaom/src/docs.cmake b/libs/libaom/src/docs.cmake
index 28ca5c026..28ca5c026 100644
--- a/media/libaom/src/docs.cmake
+++ b/libs/libaom/src/docs.cmake
diff --git a/media/libaom/src/examples/analyzer.cc b/libs/libaom/src/examples/analyzer.cc
index 35988211e..35988211e 100644
--- a/media/libaom/src/examples/analyzer.cc
+++ b/libs/libaom/src/examples/analyzer.cc
diff --git a/media/libaom/src/examples/aom_cx_set_ref.c b/libs/libaom/src/examples/aom_cx_set_ref.c
index 2f4f6586f..2f4f6586f 100644
--- a/media/libaom/src/examples/aom_cx_set_ref.c
+++ b/libs/libaom/src/examples/aom_cx_set_ref.c
diff --git a/media/libaom/src/examples/av1_dec_fuzzer.cc b/libs/libaom/src/examples/av1_dec_fuzzer.cc
index 1cddc8cc1..1cddc8cc1 100644
--- a/media/libaom/src/examples/av1_dec_fuzzer.cc
+++ b/libs/libaom/src/examples/av1_dec_fuzzer.cc
diff --git a/media/libaom/src/examples/build_av1_dec_fuzzer.sh b/libs/libaom/src/examples/build_av1_dec_fuzzer.sh
index 0dcb254da..0dcb254da 100644
--- a/media/libaom/src/examples/build_av1_dec_fuzzer.sh
+++ b/libs/libaom/src/examples/build_av1_dec_fuzzer.sh
diff --git a/media/libaom/src/examples/decode_to_md5.c b/libs/libaom/src/examples/decode_to_md5.c
index bc127b78d..bc127b78d 100644
--- a/media/libaom/src/examples/decode_to_md5.c
+++ b/libs/libaom/src/examples/decode_to_md5.c
diff --git a/media/libaom/src/examples/decode_with_drops.c b/libs/libaom/src/examples/decode_with_drops.c
index 214401958..214401958 100644
--- a/media/libaom/src/examples/decode_with_drops.c
+++ b/libs/libaom/src/examples/decode_with_drops.c
diff --git a/media/libaom/src/examples/encoder_util.c b/libs/libaom/src/examples/encoder_util.c
index e43b37250..e43b37250 100644
--- a/media/libaom/src/examples/encoder_util.c
+++ b/libs/libaom/src/examples/encoder_util.c
diff --git a/media/libaom/src/examples/encoder_util.h b/libs/libaom/src/examples/encoder_util.h
index a6bb3fb48..a6bb3fb48 100644
--- a/media/libaom/src/examples/encoder_util.h
+++ b/libs/libaom/src/examples/encoder_util.h
diff --git a/media/libaom/src/examples/inspect.c b/libs/libaom/src/examples/inspect.c
index 526bdc16c..526bdc16c 100644
--- a/media/libaom/src/examples/inspect.c
+++ b/libs/libaom/src/examples/inspect.c
diff --git a/media/libaom/src/examples/lightfield_bitstream_parsing.c b/libs/libaom/src/examples/lightfield_bitstream_parsing.c
index ffcbcb9cb..ffcbcb9cb 100644
--- a/media/libaom/src/examples/lightfield_bitstream_parsing.c
+++ b/libs/libaom/src/examples/lightfield_bitstream_parsing.c
diff --git a/media/libaom/src/examples/lightfield_decoder.c b/libs/libaom/src/examples/lightfield_decoder.c
index a292e9c75..a292e9c75 100644
--- a/media/libaom/src/examples/lightfield_decoder.c
+++ b/libs/libaom/src/examples/lightfield_decoder.c
diff --git a/media/libaom/src/examples/lightfield_encoder.c b/libs/libaom/src/examples/lightfield_encoder.c
index e80fe24f6..e80fe24f6 100644
--- a/media/libaom/src/examples/lightfield_encoder.c
+++ b/libs/libaom/src/examples/lightfield_encoder.c
diff --git a/media/libaom/src/examples/lightfield_tile_list_decoder.c b/libs/libaom/src/examples/lightfield_tile_list_decoder.c
index 3b928df2c..3b928df2c 100644
--- a/media/libaom/src/examples/lightfield_tile_list_decoder.c
+++ b/libs/libaom/src/examples/lightfield_tile_list_decoder.c
diff --git a/media/libaom/src/examples/lossless_encoder.c b/libs/libaom/src/examples/lossless_encoder.c
index e0253d2b3..e0253d2b3 100644
--- a/media/libaom/src/examples/lossless_encoder.c
+++ b/libs/libaom/src/examples/lossless_encoder.c
diff --git a/media/libaom/src/examples/noise_model.c b/libs/libaom/src/examples/noise_model.c
index d07443f9d..d07443f9d 100644
--- a/media/libaom/src/examples/noise_model.c
+++ b/libs/libaom/src/examples/noise_model.c
diff --git a/media/libaom/src/examples/resize_util.c b/libs/libaom/src/examples/resize_util.c
index 5692c2062..5692c2062 100644
--- a/media/libaom/src/examples/resize_util.c
+++ b/libs/libaom/src/examples/resize_util.c
diff --git a/media/libaom/src/examples/scalable_decoder.c b/libs/libaom/src/examples/scalable_decoder.c
index c22924223..c22924223 100644
--- a/media/libaom/src/examples/scalable_decoder.c
+++ b/libs/libaom/src/examples/scalable_decoder.c
diff --git a/media/libaom/src/examples/scalable_encoder.c b/libs/libaom/src/examples/scalable_encoder.c
index 7af03e29f..7af03e29f 100644
--- a/media/libaom/src/examples/scalable_encoder.c
+++ b/libs/libaom/src/examples/scalable_encoder.c
diff --git a/media/libaom/src/examples/set_maps.c b/libs/libaom/src/examples/set_maps.c
index 9aeb96e43..9aeb96e43 100644
--- a/media/libaom/src/examples/set_maps.c
+++ b/libs/libaom/src/examples/set_maps.c
diff --git a/media/libaom/src/examples/simple_decoder.c b/libs/libaom/src/examples/simple_decoder.c
index d098d1e0b..d098d1e0b 100644
--- a/media/libaom/src/examples/simple_decoder.c
+++ b/libs/libaom/src/examples/simple_decoder.c
diff --git a/media/libaom/src/examples/simple_encoder.c b/libs/libaom/src/examples/simple_encoder.c
index 01a37cf0c..01a37cf0c 100644
--- a/media/libaom/src/examples/simple_encoder.c
+++ b/libs/libaom/src/examples/simple_encoder.c
diff --git a/media/libaom/src/examples/svc_encoder_rtc.c b/libs/libaom/src/examples/svc_encoder_rtc.c
index 1316c6c1e..1316c6c1e 100644
--- a/media/libaom/src/examples/svc_encoder_rtc.c
+++ b/libs/libaom/src/examples/svc_encoder_rtc.c
diff --git a/media/libaom/src/examples/twopass_encoder.c b/libs/libaom/src/examples/twopass_encoder.c
index a03bc6cc2..a03bc6cc2 100644
--- a/media/libaom/src/examples/twopass_encoder.c
+++ b/libs/libaom/src/examples/twopass_encoder.c
diff --git a/media/libaom/src/keywords.dox b/libs/libaom/src/keywords.dox
index 56f536890..56f536890 100644
--- a/media/libaom/src/keywords.dox
+++ b/libs/libaom/src/keywords.dox
diff --git a/media/libaom/src/libs.doxy_template b/libs/libaom/src/libs.doxy_template
index c522e21d3..c522e21d3 100644
--- a/media/libaom/src/libs.doxy_template
+++ b/libs/libaom/src/libs.doxy_template
diff --git a/media/libaom/src/mainpage.dox b/libs/libaom/src/mainpage.dox
index 03a299ae1..03a299ae1 100644
--- a/media/libaom/src/mainpage.dox
+++ b/libs/libaom/src/mainpage.dox
diff --git a/media/libaom/src/stats/aomstats.c b/libs/libaom/src/stats/aomstats.c
index 4a15adf02..4a15adf02 100644
--- a/media/libaom/src/stats/aomstats.c
+++ b/libs/libaom/src/stats/aomstats.c
diff --git a/media/libaom/src/stats/aomstats.h b/libs/libaom/src/stats/aomstats.h
index b9c71871a..b9c71871a 100644
--- a/media/libaom/src/stats/aomstats.h
+++ b/libs/libaom/src/stats/aomstats.h
diff --git a/media/libaom/src/stats/rate_hist.c b/libs/libaom/src/stats/rate_hist.c
index 71eb78b72..71eb78b72 100644
--- a/media/libaom/src/stats/rate_hist.c
+++ b/libs/libaom/src/stats/rate_hist.c
diff --git a/media/libaom/src/stats/rate_hist.h b/libs/libaom/src/stats/rate_hist.h
index 55b8c5d43..55b8c5d43 100644
--- a/media/libaom/src/stats/rate_hist.h
+++ b/libs/libaom/src/stats/rate_hist.h
diff --git a/media/libaom/src/test/accounting_test.cc b/libs/libaom/src/test/accounting_test.cc
index 8b5c8af13..8b5c8af13 100644
--- a/media/libaom/src/test/accounting_test.cc
+++ b/libs/libaom/src/test/accounting_test.cc
diff --git a/media/libaom/src/test/acm_random.h b/libs/libaom/src/test/acm_random.h
index 8b1d51aef..8b1d51aef 100644
--- a/media/libaom/src/test/acm_random.h
+++ b/libs/libaom/src/test/acm_random.h
diff --git a/media/libaom/src/test/active_map_test.cc b/libs/libaom/src/test/active_map_test.cc
index 0f8a7329e..0f8a7329e 100644
--- a/media/libaom/src/test/active_map_test.cc
+++ b/libs/libaom/src/test/active_map_test.cc
diff --git a/media/libaom/src/test/altref_test.cc b/libs/libaom/src/test/altref_test.cc
index 43df39fb6..43df39fb6 100644
--- a/media/libaom/src/test/altref_test.cc
+++ b/libs/libaom/src/test/altref_test.cc
diff --git a/media/libaom/src/test/aom_integer_test.cc b/libs/libaom/src/test/aom_integer_test.cc
index d5dfad946..d5dfad946 100644
--- a/media/libaom/src/test/aom_integer_test.cc
+++ b/libs/libaom/src/test/aom_integer_test.cc
diff --git a/media/libaom/src/test/aomcx_set_ref.sh b/libs/libaom/src/test/aomcx_set_ref.sh
index f51b73c58..f51b73c58 100644
--- a/media/libaom/src/test/aomcx_set_ref.sh
+++ b/libs/libaom/src/test/aomcx_set_ref.sh
diff --git a/media/libaom/src/test/aomdec.sh b/libs/libaom/src/test/aomdec.sh
index 927142287..927142287 100644
--- a/media/libaom/src/test/aomdec.sh
+++ b/libs/libaom/src/test/aomdec.sh
diff --git a/media/libaom/src/test/aomenc.sh b/libs/libaom/src/test/aomenc.sh
index b030397a3..b030397a3 100644
--- a/media/libaom/src/test/aomenc.sh
+++ b/libs/libaom/src/test/aomenc.sh
diff --git a/media/libaom/src/test/aq_segment_test.cc b/libs/libaom/src/test/aq_segment_test.cc
index 83bfdb670..83bfdb670 100644
--- a/media/libaom/src/test/aq_segment_test.cc
+++ b/libs/libaom/src/test/aq_segment_test.cc
diff --git a/media/libaom/src/test/arf_freq_test.cc b/libs/libaom/src/test/arf_freq_test.cc
index 0780cd712..0780cd712 100644
--- a/media/libaom/src/test/arf_freq_test.cc
+++ b/libs/libaom/src/test/arf_freq_test.cc
diff --git a/media/libaom/src/test/av1_common_int_test.cc b/libs/libaom/src/test/av1_common_int_test.cc
index dde2542e3..dde2542e3 100644
--- a/media/libaom/src/test/av1_common_int_test.cc
+++ b/libs/libaom/src/test/av1_common_int_test.cc
diff --git a/media/libaom/src/test/av1_config_test.cc b/libs/libaom/src/test/av1_config_test.cc
index fca980f06..fca980f06 100644
--- a/media/libaom/src/test/av1_config_test.cc
+++ b/libs/libaom/src/test/av1_config_test.cc
diff --git a/media/libaom/src/test/av1_convolve_2d_test.cc b/libs/libaom/src/test/av1_convolve_2d_test.cc
index 50a58f06d..50a58f06d 100644
--- a/media/libaom/src/test/av1_convolve_2d_test.cc
+++ b/libs/libaom/src/test/av1_convolve_2d_test.cc
diff --git a/media/libaom/src/test/av1_convolve_2d_test_util.cc b/libs/libaom/src/test/av1_convolve_2d_test_util.cc
index 6f103d3f6..6f103d3f6 100644
--- a/media/libaom/src/test/av1_convolve_2d_test_util.cc
+++ b/libs/libaom/src/test/av1_convolve_2d_test_util.cc
diff --git a/media/libaom/src/test/av1_convolve_2d_test_util.h b/libs/libaom/src/test/av1_convolve_2d_test_util.h
index 3c19cfed3..3c19cfed3 100644
--- a/media/libaom/src/test/av1_convolve_2d_test_util.h
+++ b/libs/libaom/src/test/av1_convolve_2d_test_util.h
diff --git a/media/libaom/src/test/av1_convolve_scale_test.cc b/libs/libaom/src/test/av1_convolve_scale_test.cc
index ffd0bab33..ffd0bab33 100644
--- a/media/libaom/src/test/av1_convolve_scale_test.cc
+++ b/libs/libaom/src/test/av1_convolve_scale_test.cc
diff --git a/media/libaom/src/test/av1_encoder_parms_get_to_decoder.cc b/libs/libaom/src/test/av1_encoder_parms_get_to_decoder.cc
index 76b82f58f..76b82f58f 100644
--- a/media/libaom/src/test/av1_encoder_parms_get_to_decoder.cc
+++ b/libs/libaom/src/test/av1_encoder_parms_get_to_decoder.cc
diff --git a/media/libaom/src/test/av1_ext_tile_test.cc b/libs/libaom/src/test/av1_ext_tile_test.cc
index 424d2f065..424d2f065 100644
--- a/media/libaom/src/test/av1_ext_tile_test.cc
+++ b/libs/libaom/src/test/av1_ext_tile_test.cc
diff --git a/media/libaom/src/test/av1_fwd_txfm1d_test.cc b/libs/libaom/src/test/av1_fwd_txfm1d_test.cc
index abc46ed5a..abc46ed5a 100644
--- a/media/libaom/src/test/av1_fwd_txfm1d_test.cc
+++ b/libs/libaom/src/test/av1_fwd_txfm1d_test.cc
diff --git a/media/libaom/src/test/av1_fwd_txfm2d_test.cc b/libs/libaom/src/test/av1_fwd_txfm2d_test.cc
index dd6066576..dd6066576 100644
--- a/media/libaom/src/test/av1_fwd_txfm2d_test.cc
+++ b/libs/libaom/src/test/av1_fwd_txfm2d_test.cc
diff --git a/media/libaom/src/test/av1_highbd_iht_test.cc b/libs/libaom/src/test/av1_highbd_iht_test.cc
index 8fea500db..8fea500db 100644
--- a/media/libaom/src/test/av1_highbd_iht_test.cc
+++ b/libs/libaom/src/test/av1_highbd_iht_test.cc
diff --git a/media/libaom/src/test/av1_horz_only_frame_superres_test.cc b/libs/libaom/src/test/av1_horz_only_frame_superres_test.cc
index 115fc84c0..115fc84c0 100644
--- a/media/libaom/src/test/av1_horz_only_frame_superres_test.cc
+++ b/libs/libaom/src/test/av1_horz_only_frame_superres_test.cc
diff --git a/media/libaom/src/test/av1_inv_txfm1d_test.cc b/libs/libaom/src/test/av1_inv_txfm1d_test.cc
index 01d4a4d7f..01d4a4d7f 100644
--- a/media/libaom/src/test/av1_inv_txfm1d_test.cc
+++ b/libs/libaom/src/test/av1_inv_txfm1d_test.cc
diff --git a/media/libaom/src/test/av1_inv_txfm2d_test.cc b/libs/libaom/src/test/av1_inv_txfm2d_test.cc
index eacdf85d4..eacdf85d4 100644
--- a/media/libaom/src/test/av1_inv_txfm2d_test.cc
+++ b/libs/libaom/src/test/av1_inv_txfm2d_test.cc
diff --git a/media/libaom/src/test/av1_nn_predict_test.cc b/libs/libaom/src/test/av1_nn_predict_test.cc
index c03cba8c5..c03cba8c5 100644
--- a/media/libaom/src/test/av1_nn_predict_test.cc
+++ b/libs/libaom/src/test/av1_nn_predict_test.cc
diff --git a/media/libaom/src/test/av1_quantize_test.cc b/libs/libaom/src/test/av1_quantize_test.cc
index 39a3c33d8..39a3c33d8 100644
--- a/media/libaom/src/test/av1_quantize_test.cc
+++ b/libs/libaom/src/test/av1_quantize_test.cc
diff --git a/media/libaom/src/test/av1_round_shift_array_test.cc b/libs/libaom/src/test/av1_round_shift_array_test.cc
index 993fa9f19..993fa9f19 100644
--- a/media/libaom/src/test/av1_round_shift_array_test.cc
+++ b/libs/libaom/src/test/av1_round_shift_array_test.cc
diff --git a/media/libaom/src/test/av1_txfm_test.cc b/libs/libaom/src/test/av1_txfm_test.cc
index aedd45d13..aedd45d13 100644
--- a/media/libaom/src/test/av1_txfm_test.cc
+++ b/libs/libaom/src/test/av1_txfm_test.cc
diff --git a/media/libaom/src/test/av1_txfm_test.h b/libs/libaom/src/test/av1_txfm_test.h
index 5a56d28f1..5a56d28f1 100644
--- a/media/libaom/src/test/av1_txfm_test.h
+++ b/libs/libaom/src/test/av1_txfm_test.h
diff --git a/media/libaom/src/test/av1_wedge_utils_test.cc b/libs/libaom/src/test/av1_wedge_utils_test.cc
index f9dc838ff..f9dc838ff 100644
--- a/media/libaom/src/test/av1_wedge_utils_test.cc
+++ b/libs/libaom/src/test/av1_wedge_utils_test.cc
diff --git a/media/libaom/src/test/avg_test.cc b/libs/libaom/src/test/avg_test.cc
index 1742aec5f..1742aec5f 100644
--- a/media/libaom/src/test/avg_test.cc
+++ b/libs/libaom/src/test/avg_test.cc
diff --git a/media/libaom/src/test/best_encode.sh b/libs/libaom/src/test/best_encode.sh
index fe31a01cb..fe31a01cb 100644
--- a/media/libaom/src/test/best_encode.sh
+++ b/libs/libaom/src/test/best_encode.sh
diff --git a/media/libaom/src/test/binary_codes_test.cc b/libs/libaom/src/test/binary_codes_test.cc
index 45660cf85..45660cf85 100644
--- a/media/libaom/src/test/binary_codes_test.cc
+++ b/libs/libaom/src/test/binary_codes_test.cc
diff --git a/media/libaom/src/test/blend_a64_mask_1d_test.cc b/libs/libaom/src/test/blend_a64_mask_1d_test.cc
index 1b6350c79..1b6350c79 100644
--- a/media/libaom/src/test/blend_a64_mask_1d_test.cc
+++ b/libs/libaom/src/test/blend_a64_mask_1d_test.cc
diff --git a/media/libaom/src/test/blend_a64_mask_test.cc b/libs/libaom/src/test/blend_a64_mask_test.cc
index 5c2c291fd..5c2c291fd 100644
--- a/media/libaom/src/test/blend_a64_mask_test.cc
+++ b/libs/libaom/src/test/blend_a64_mask_test.cc
diff --git a/media/libaom/src/test/blockd_test.cc b/libs/libaom/src/test/blockd_test.cc
index 17e696863..17e696863 100644
--- a/media/libaom/src/test/blockd_test.cc
+++ b/libs/libaom/src/test/blockd_test.cc
diff --git a/media/libaom/src/test/boolcoder_test.cc b/libs/libaom/src/test/boolcoder_test.cc
index 680ec1877..680ec1877 100644
--- a/media/libaom/src/test/boolcoder_test.cc
+++ b/libs/libaom/src/test/boolcoder_test.cc
diff --git a/media/libaom/src/test/borders_test.cc b/libs/libaom/src/test/borders_test.cc
index 31eacab12..31eacab12 100644
--- a/media/libaom/src/test/borders_test.cc
+++ b/libs/libaom/src/test/borders_test.cc
diff --git a/media/libaom/src/test/cdef_test.cc b/libs/libaom/src/test/cdef_test.cc
index a2ec1e31e..a2ec1e31e 100644
--- a/media/libaom/src/test/cdef_test.cc
+++ b/libs/libaom/src/test/cdef_test.cc
diff --git a/media/libaom/src/test/cfl_test.cc b/libs/libaom/src/test/cfl_test.cc
index d2973159c..d2973159c 100644
--- a/media/libaom/src/test/cfl_test.cc
+++ b/libs/libaom/src/test/cfl_test.cc
diff --git a/media/libaom/src/test/clear_system_state.h b/libs/libaom/src/test/clear_system_state.h
index d38ff5dd5..d38ff5dd5 100644
--- a/media/libaom/src/test/clear_system_state.h
+++ b/libs/libaom/src/test/clear_system_state.h
diff --git a/media/libaom/src/test/cnn_test.cc b/libs/libaom/src/test/cnn_test.cc
index 4410493d3..4410493d3 100644
--- a/media/libaom/src/test/cnn_test.cc
+++ b/libs/libaom/src/test/cnn_test.cc
diff --git a/media/libaom/src/test/codec_factory.h b/libs/libaom/src/test/codec_factory.h
index 801b8948f..801b8948f 100644
--- a/media/libaom/src/test/codec_factory.h
+++ b/libs/libaom/src/test/codec_factory.h
diff --git a/media/libaom/src/test/coding_path_sync.cc b/libs/libaom/src/test/coding_path_sync.cc
index 4c613dc03..4c613dc03 100644
--- a/media/libaom/src/test/coding_path_sync.cc
+++ b/libs/libaom/src/test/coding_path_sync.cc
diff --git a/media/libaom/src/test/comp_avg_pred_test.cc b/libs/libaom/src/test/comp_avg_pred_test.cc
index ac625a79d..ac625a79d 100644
--- a/media/libaom/src/test/comp_avg_pred_test.cc
+++ b/libs/libaom/src/test/comp_avg_pred_test.cc
diff --git a/media/libaom/src/test/comp_avg_pred_test.h b/libs/libaom/src/test/comp_avg_pred_test.h
index 7f73312c4..7f73312c4 100644
--- a/media/libaom/src/test/comp_avg_pred_test.h
+++ b/libs/libaom/src/test/comp_avg_pred_test.h
diff --git a/media/libaom/src/test/comp_mask_variance_test.cc b/libs/libaom/src/test/comp_mask_variance_test.cc
index b666306a3..b666306a3 100644
--- a/media/libaom/src/test/comp_mask_variance_test.cc
+++ b/libs/libaom/src/test/comp_mask_variance_test.cc
diff --git a/media/libaom/src/test/convolve_round_test.cc b/libs/libaom/src/test/convolve_round_test.cc
index 4f17b5472..4f17b5472 100644
--- a/media/libaom/src/test/convolve_round_test.cc
+++ b/libs/libaom/src/test/convolve_round_test.cc
diff --git a/media/libaom/src/test/convolve_test.cc b/libs/libaom/src/test/convolve_test.cc
index 0b1eea16a..0b1eea16a 100644
--- a/media/libaom/src/test/convolve_test.cc
+++ b/libs/libaom/src/test/convolve_test.cc
diff --git a/media/libaom/src/test/corner_match_test.cc b/libs/libaom/src/test/corner_match_test.cc
index c685dca80..c685dca80 100644
--- a/media/libaom/src/test/corner_match_test.cc
+++ b/libs/libaom/src/test/corner_match_test.cc
diff --git a/media/libaom/src/test/cpu_speed_test.cc b/libs/libaom/src/test/cpu_speed_test.cc
index 2a164974b..2a164974b 100644
--- a/media/libaom/src/test/cpu_speed_test.cc
+++ b/libs/libaom/src/test/cpu_speed_test.cc
diff --git a/media/libaom/src/test/datarate_test.cc b/libs/libaom/src/test/datarate_test.cc
index 053c05571..053c05571 100644
--- a/media/libaom/src/test/datarate_test.cc
+++ b/libs/libaom/src/test/datarate_test.cc
diff --git a/media/libaom/src/test/datarate_test.h b/libs/libaom/src/test/datarate_test.h
index 3c1573119..3c1573119 100644
--- a/media/libaom/src/test/datarate_test.h
+++ b/libs/libaom/src/test/datarate_test.h
diff --git a/media/libaom/src/test/decode_api_test.cc b/libs/libaom/src/test/decode_api_test.cc
index 910640df7..910640df7 100644
--- a/media/libaom/src/test/decode_api_test.cc
+++ b/libs/libaom/src/test/decode_api_test.cc
diff --git a/media/libaom/src/test/decode_multithreaded_test.cc b/libs/libaom/src/test/decode_multithreaded_test.cc
index 92253ede8..92253ede8 100644
--- a/media/libaom/src/test/decode_multithreaded_test.cc
+++ b/libs/libaom/src/test/decode_multithreaded_test.cc
diff --git a/media/libaom/src/test/decode_perf_test.cc b/libs/libaom/src/test/decode_perf_test.cc
index 691337cd6..691337cd6 100644
--- a/media/libaom/src/test/decode_perf_test.cc
+++ b/libs/libaom/src/test/decode_perf_test.cc
diff --git a/media/libaom/src/test/decode_test_driver.cc b/libs/libaom/src/test/decode_test_driver.cc
index 70de0cff6..70de0cff6 100644
--- a/media/libaom/src/test/decode_test_driver.cc
+++ b/libs/libaom/src/test/decode_test_driver.cc
diff --git a/media/libaom/src/test/decode_test_driver.h b/libs/libaom/src/test/decode_test_driver.h
index 64722f43a..64722f43a 100644
--- a/media/libaom/src/test/decode_test_driver.h
+++ b/libs/libaom/src/test/decode_test_driver.h
diff --git a/media/libaom/src/test/decode_to_md5.sh b/libs/libaom/src/test/decode_to_md5.sh
index 2edd1cb52..2edd1cb52 100644
--- a/media/libaom/src/test/decode_to_md5.sh
+++ b/libs/libaom/src/test/decode_to_md5.sh
diff --git a/media/libaom/src/test/decode_with_drops.sh b/libs/libaom/src/test/decode_with_drops.sh
index 155ee9207..155ee9207 100644
--- a/media/libaom/src/test/decode_with_drops.sh
+++ b/libs/libaom/src/test/decode_with_drops.sh
diff --git a/media/libaom/src/test/divu_small_test.cc b/libs/libaom/src/test/divu_small_test.cc
index f4d0846cf..f4d0846cf 100644
--- a/media/libaom/src/test/divu_small_test.cc
+++ b/libs/libaom/src/test/divu_small_test.cc
diff --git a/media/libaom/src/test/dr_prediction_test.cc b/libs/libaom/src/test/dr_prediction_test.cc
index e8865c02a..e8865c02a 100644
--- a/media/libaom/src/test/dr_prediction_test.cc
+++ b/libs/libaom/src/test/dr_prediction_test.cc
diff --git a/media/libaom/src/test/dump_obu.sh b/libs/libaom/src/test/dump_obu.sh
index da44dd7e6..da44dd7e6 100644
--- a/media/libaom/src/test/dump_obu.sh
+++ b/libs/libaom/src/test/dump_obu.sh
diff --git a/media/libaom/src/test/ec_test.cc b/libs/libaom/src/test/ec_test.cc
index 853abcbc5..853abcbc5 100644
--- a/media/libaom/src/test/ec_test.cc
+++ b/libs/libaom/src/test/ec_test.cc
diff --git a/media/libaom/src/test/edge_detect_test.cc b/libs/libaom/src/test/edge_detect_test.cc
index 33fbbc0bb..33fbbc0bb 100644
--- a/media/libaom/src/test/edge_detect_test.cc
+++ b/libs/libaom/src/test/edge_detect_test.cc
diff --git a/media/libaom/src/test/encode_api_test.cc b/libs/libaom/src/test/encode_api_test.cc
index 25bdb5c3f..25bdb5c3f 100644
--- a/media/libaom/src/test/encode_api_test.cc
+++ b/libs/libaom/src/test/encode_api_test.cc
diff --git a/media/libaom/src/test/encode_perf_test.cc b/libs/libaom/src/test/encode_perf_test.cc
index 390a6e0e6..390a6e0e6 100644
--- a/media/libaom/src/test/encode_perf_test.cc
+++ b/libs/libaom/src/test/encode_perf_test.cc
diff --git a/media/libaom/src/test/encode_test_driver.cc b/libs/libaom/src/test/encode_test_driver.cc
index 01f8d501a..01f8d501a 100644
--- a/media/libaom/src/test/encode_test_driver.cc
+++ b/libs/libaom/src/test/encode_test_driver.cc
diff --git a/media/libaom/src/test/encode_test_driver.h b/libs/libaom/src/test/encode_test_driver.h
index 6319a5220..6319a5220 100644
--- a/media/libaom/src/test/encode_test_driver.h
+++ b/libs/libaom/src/test/encode_test_driver.h
diff --git a/media/libaom/src/test/encodetxb_test.cc b/libs/libaom/src/test/encodetxb_test.cc
index 385d3f1a8..385d3f1a8 100644
--- a/media/libaom/src/test/encodetxb_test.cc
+++ b/libs/libaom/src/test/encodetxb_test.cc
diff --git a/media/libaom/src/test/end_to_end_test.cc b/libs/libaom/src/test/end_to_end_test.cc
index 162a7c743..162a7c743 100644
--- a/media/libaom/src/test/end_to_end_test.cc
+++ b/libs/libaom/src/test/end_to_end_test.cc
diff --git a/media/libaom/src/test/error_block_test.cc b/libs/libaom/src/test/error_block_test.cc
index 462661e61..462661e61 100644
--- a/media/libaom/src/test/error_block_test.cc
+++ b/libs/libaom/src/test/error_block_test.cc
diff --git a/media/libaom/src/test/error_resilience_test.cc b/libs/libaom/src/test/error_resilience_test.cc
index 1d52bb24a..1d52bb24a 100644
--- a/media/libaom/src/test/error_resilience_test.cc
+++ b/libs/libaom/src/test/error_resilience_test.cc
diff --git a/media/libaom/src/test/ethread_test.cc b/libs/libaom/src/test/ethread_test.cc
index 306cc2f3a..306cc2f3a 100644
--- a/media/libaom/src/test/ethread_test.cc
+++ b/libs/libaom/src/test/ethread_test.cc
diff --git a/media/libaom/src/test/examples.sh b/libs/libaom/src/test/examples.sh
index 2cdb89dd0..2cdb89dd0 100644
--- a/media/libaom/src/test/examples.sh
+++ b/libs/libaom/src/test/examples.sh
diff --git a/media/libaom/src/test/external_frame_buffer_test.cc b/libs/libaom/src/test/external_frame_buffer_test.cc
index 1d726a4f1..1d726a4f1 100644
--- a/media/libaom/src/test/external_frame_buffer_test.cc
+++ b/libs/libaom/src/test/external_frame_buffer_test.cc
diff --git a/media/libaom/src/test/fdct4x4_test.cc b/libs/libaom/src/test/fdct4x4_test.cc
index 6600f2c46..6600f2c46 100644
--- a/media/libaom/src/test/fdct4x4_test.cc
+++ b/libs/libaom/src/test/fdct4x4_test.cc
diff --git a/media/libaom/src/test/fft_test.cc b/libs/libaom/src/test/fft_test.cc
index d23aa012c..d23aa012c 100644
--- a/media/libaom/src/test/fft_test.cc
+++ b/libs/libaom/src/test/fft_test.cc
diff --git a/media/libaom/src/test/film_grain_table_test.cc b/libs/libaom/src/test/film_grain_table_test.cc
index 524d67d7b..524d67d7b 100644
--- a/media/libaom/src/test/film_grain_table_test.cc
+++ b/libs/libaom/src/test/film_grain_table_test.cc
diff --git a/media/libaom/src/test/filterintra_test.cc b/libs/libaom/src/test/filterintra_test.cc
index 284353c69..284353c69 100644
--- a/media/libaom/src/test/filterintra_test.cc
+++ b/libs/libaom/src/test/filterintra_test.cc
diff --git a/media/libaom/src/test/frame_error_test.cc b/libs/libaom/src/test/frame_error_test.cc
index 6d74a68f2..6d74a68f2 100644
--- a/media/libaom/src/test/frame_error_test.cc
+++ b/libs/libaom/src/test/frame_error_test.cc
diff --git a/media/libaom/src/test/frame_size_tests.cc b/libs/libaom/src/test/frame_size_tests.cc
index 1546012a3..1546012a3 100644
--- a/media/libaom/src/test/frame_size_tests.cc
+++ b/libs/libaom/src/test/frame_size_tests.cc
diff --git a/media/libaom/src/test/function_equivalence_test.h b/libs/libaom/src/test/function_equivalence_test.h
index a299c48d4..a299c48d4 100644
--- a/media/libaom/src/test/function_equivalence_test.h
+++ b/libs/libaom/src/test/function_equivalence_test.h
diff --git a/media/libaom/src/test/fwd_kf_test.cc b/libs/libaom/src/test/fwd_kf_test.cc
index 50c2f36d8..50c2f36d8 100644
--- a/media/libaom/src/test/fwd_kf_test.cc
+++ b/libs/libaom/src/test/fwd_kf_test.cc
diff --git a/media/libaom/src/test/fwht4x4_test.cc b/libs/libaom/src/test/fwht4x4_test.cc
index d2f77b8d4..d2f77b8d4 100644
--- a/media/libaom/src/test/fwht4x4_test.cc
+++ b/libs/libaom/src/test/fwht4x4_test.cc
diff --git a/media/libaom/src/test/gf_pyr_height_test.cc b/libs/libaom/src/test/gf_pyr_height_test.cc
index b1ade67a6..b1ade67a6 100644
--- a/media/libaom/src/test/gf_pyr_height_test.cc
+++ b/libs/libaom/src/test/gf_pyr_height_test.cc
diff --git a/media/libaom/src/test/gviz_api.py b/libs/libaom/src/test/gviz_api.py
index d3a443dab..d3a443dab 100644
--- a/media/libaom/src/test/gviz_api.py
+++ b/libs/libaom/src/test/gviz_api.py
diff --git a/media/libaom/src/test/hadamard_test.cc b/libs/libaom/src/test/hadamard_test.cc
index 7903259e7..7903259e7 100644
--- a/media/libaom/src/test/hadamard_test.cc
+++ b/libs/libaom/src/test/hadamard_test.cc
diff --git a/media/libaom/src/test/hash_test.cc b/libs/libaom/src/test/hash_test.cc
index eb964ac5f..eb964ac5f 100644
--- a/media/libaom/src/test/hash_test.cc
+++ b/libs/libaom/src/test/hash_test.cc
diff --git a/media/libaom/src/test/hbd_metrics_test.cc b/libs/libaom/src/test/hbd_metrics_test.cc
index 5b03beee7..5b03beee7 100644
--- a/media/libaom/src/test/hbd_metrics_test.cc
+++ b/libs/libaom/src/test/hbd_metrics_test.cc
diff --git a/media/libaom/src/test/hiprec_convolve_test.cc b/libs/libaom/src/test/hiprec_convolve_test.cc
index 59d28e883..59d28e883 100644
--- a/media/libaom/src/test/hiprec_convolve_test.cc
+++ b/libs/libaom/src/test/hiprec_convolve_test.cc
diff --git a/media/libaom/src/test/hiprec_convolve_test_util.cc b/libs/libaom/src/test/hiprec_convolve_test_util.cc
index 956af7fc8..956af7fc8 100644
--- a/media/libaom/src/test/hiprec_convolve_test_util.cc
+++ b/libs/libaom/src/test/hiprec_convolve_test_util.cc
diff --git a/media/libaom/src/test/hiprec_convolve_test_util.h b/libs/libaom/src/test/hiprec_convolve_test_util.h
index 6b6da4ee8..6b6da4ee8 100644
--- a/media/libaom/src/test/hiprec_convolve_test_util.h
+++ b/libs/libaom/src/test/hiprec_convolve_test_util.h
diff --git a/media/libaom/src/test/horver_correlation_test.cc b/libs/libaom/src/test/horver_correlation_test.cc
index ccb8eddd0..ccb8eddd0 100644
--- a/media/libaom/src/test/horver_correlation_test.cc
+++ b/libs/libaom/src/test/horver_correlation_test.cc
diff --git a/media/libaom/src/test/horz_superres_test.cc b/libs/libaom/src/test/horz_superres_test.cc
index 938b0b15a..938b0b15a 100644
--- a/media/libaom/src/test/horz_superres_test.cc
+++ b/libs/libaom/src/test/horz_superres_test.cc
diff --git a/media/libaom/src/test/i420_video_source.h b/libs/libaom/src/test/i420_video_source.h
index 233e7152b..233e7152b 100644
--- a/media/libaom/src/test/i420_video_source.h
+++ b/libs/libaom/src/test/i420_video_source.h
diff --git a/media/libaom/src/test/intra_edge_test.cc b/libs/libaom/src/test/intra_edge_test.cc
index f7702c952..f7702c952 100644
--- a/media/libaom/src/test/intra_edge_test.cc
+++ b/libs/libaom/src/test/intra_edge_test.cc
diff --git a/media/libaom/src/test/intrabc_test.cc b/libs/libaom/src/test/intrabc_test.cc
index b57eb6fab..b57eb6fab 100644
--- a/media/libaom/src/test/intrabc_test.cc
+++ b/libs/libaom/src/test/intrabc_test.cc
diff --git a/media/libaom/src/test/intrapred_test.cc b/libs/libaom/src/test/intrapred_test.cc
index 779cf9a5d..779cf9a5d 100644
--- a/media/libaom/src/test/intrapred_test.cc
+++ b/libs/libaom/src/test/intrapred_test.cc
diff --git a/media/libaom/src/test/invalid_file_test.cc b/libs/libaom/src/test/invalid_file_test.cc
index dd0956d0c..dd0956d0c 100644
--- a/media/libaom/src/test/invalid_file_test.cc
+++ b/libs/libaom/src/test/invalid_file_test.cc
diff --git a/media/libaom/src/test/ivf_video_source.h b/libs/libaom/src/test/ivf_video_source.h
index ff2841445..ff2841445 100644
--- a/media/libaom/src/test/ivf_video_source.h
+++ b/libs/libaom/src/test/ivf_video_source.h
diff --git a/media/libaom/src/test/level_test.cc b/libs/libaom/src/test/level_test.cc
index a9613c5f7..a9613c5f7 100644
--- a/media/libaom/src/test/level_test.cc
+++ b/libs/libaom/src/test/level_test.cc
diff --git a/media/libaom/src/test/lightfield_test.sh b/libs/libaom/src/test/lightfield_test.sh
index 3de88af87..3de88af87 100644
--- a/media/libaom/src/test/lightfield_test.sh
+++ b/libs/libaom/src/test/lightfield_test.sh
diff --git a/media/libaom/src/test/log2_test.cc b/libs/libaom/src/test/log2_test.cc
index d7840c68b..d7840c68b 100644
--- a/media/libaom/src/test/log2_test.cc
+++ b/libs/libaom/src/test/log2_test.cc
diff --git a/media/libaom/src/test/lossless_test.cc b/libs/libaom/src/test/lossless_test.cc
index 71ae5e72b..71ae5e72b 100644
--- a/media/libaom/src/test/lossless_test.cc
+++ b/libs/libaom/src/test/lossless_test.cc
diff --git a/media/libaom/src/test/lpf_test.cc b/libs/libaom/src/test/lpf_test.cc
index e8eeceb7c..e8eeceb7c 100644
--- a/media/libaom/src/test/lpf_test.cc
+++ b/libs/libaom/src/test/lpf_test.cc
diff --git a/media/libaom/src/test/masked_sad_test.cc b/libs/libaom/src/test/masked_sad_test.cc
index aa4dd8341..aa4dd8341 100644
--- a/media/libaom/src/test/masked_sad_test.cc
+++ b/libs/libaom/src/test/masked_sad_test.cc
diff --git a/media/libaom/src/test/masked_variance_test.cc b/libs/libaom/src/test/masked_variance_test.cc
index bf814cea2..bf814cea2 100644
--- a/media/libaom/src/test/masked_variance_test.cc
+++ b/libs/libaom/src/test/masked_variance_test.cc
diff --git a/media/libaom/src/test/md5_helper.h b/libs/libaom/src/test/md5_helper.h
index 9443cb262..9443cb262 100644
--- a/media/libaom/src/test/md5_helper.h
+++ b/libs/libaom/src/test/md5_helper.h
diff --git a/media/libaom/src/test/metadata_test.cc b/libs/libaom/src/test/metadata_test.cc
index 79e08a7a5..79e08a7a5 100644
--- a/media/libaom/src/test/metadata_test.cc
+++ b/libs/libaom/src/test/metadata_test.cc
diff --git a/media/libaom/src/test/metrics_template.html b/libs/libaom/src/test/metrics_template.html
index b57c62314..b57c62314 100644
--- a/media/libaom/src/test/metrics_template.html
+++ b/libs/libaom/src/test/metrics_template.html
diff --git a/media/libaom/src/test/monochrome_test.cc b/libs/libaom/src/test/monochrome_test.cc
index ebccba584..ebccba584 100644
--- a/media/libaom/src/test/monochrome_test.cc
+++ b/libs/libaom/src/test/monochrome_test.cc
diff --git a/media/libaom/src/test/motion_vector_test.cc b/libs/libaom/src/test/motion_vector_test.cc
index 2636c39aa..2636c39aa 100644
--- a/media/libaom/src/test/motion_vector_test.cc
+++ b/libs/libaom/src/test/motion_vector_test.cc
diff --git a/media/libaom/src/test/noise_model_test.cc b/libs/libaom/src/test/noise_model_test.cc
index 5b61236f0..5b61236f0 100644
--- a/media/libaom/src/test/noise_model_test.cc
+++ b/libs/libaom/src/test/noise_model_test.cc
diff --git a/media/libaom/src/test/obmc_sad_test.cc b/libs/libaom/src/test/obmc_sad_test.cc
index 6b4382cd7..6b4382cd7 100644
--- a/media/libaom/src/test/obmc_sad_test.cc
+++ b/libs/libaom/src/test/obmc_sad_test.cc
diff --git a/media/libaom/src/test/obmc_variance_test.cc b/libs/libaom/src/test/obmc_variance_test.cc
index fc281d70b..fc281d70b 100644
--- a/media/libaom/src/test/obmc_variance_test.cc
+++ b/libs/libaom/src/test/obmc_variance_test.cc
diff --git a/media/libaom/src/test/pickrst_test.cc b/libs/libaom/src/test/pickrst_test.cc
index 9a2c5bcd4..9a2c5bcd4 100644
--- a/media/libaom/src/test/pickrst_test.cc
+++ b/libs/libaom/src/test/pickrst_test.cc
diff --git a/media/libaom/src/test/qm_test.cc b/libs/libaom/src/test/qm_test.cc
index d1dfbb849..d1dfbb849 100644
--- a/media/libaom/src/test/qm_test.cc
+++ b/libs/libaom/src/test/qm_test.cc
diff --git a/media/libaom/src/test/quantize_func_test.cc b/libs/libaom/src/test/quantize_func_test.cc
index b40b38d5a..b40b38d5a 100644
--- a/media/libaom/src/test/quantize_func_test.cc
+++ b/libs/libaom/src/test/quantize_func_test.cc
diff --git a/media/libaom/src/test/reconinter_test.cc b/libs/libaom/src/test/reconinter_test.cc
index 51bec0eab..51bec0eab 100644
--- a/media/libaom/src/test/reconinter_test.cc
+++ b/libs/libaom/src/test/reconinter_test.cc
diff --git a/media/libaom/src/test/register_state_check.h b/libs/libaom/src/test/register_state_check.h
index d404621dd..d404621dd 100644
--- a/media/libaom/src/test/register_state_check.h
+++ b/libs/libaom/src/test/register_state_check.h
diff --git a/media/libaom/src/test/resize_test.cc b/libs/libaom/src/test/resize_test.cc
index bcf6794d0..bcf6794d0 100644
--- a/media/libaom/src/test/resize_test.cc
+++ b/libs/libaom/src/test/resize_test.cc
diff --git a/media/libaom/src/test/rt_end_to_end_test.cc b/libs/libaom/src/test/rt_end_to_end_test.cc
index f14d12474..f14d12474 100644
--- a/media/libaom/src/test/rt_end_to_end_test.cc
+++ b/libs/libaom/src/test/rt_end_to_end_test.cc
diff --git a/media/libaom/src/test/run_encodes.sh b/libs/libaom/src/test/run_encodes.sh
index 2096d8b15..2096d8b15 100644
--- a/media/libaom/src/test/run_encodes.sh
+++ b/libs/libaom/src/test/run_encodes.sh
diff --git a/media/libaom/src/test/sad_test.cc b/libs/libaom/src/test/sad_test.cc
index 0bdbf3745..0bdbf3745 100644
--- a/media/libaom/src/test/sad_test.cc
+++ b/libs/libaom/src/test/sad_test.cc
diff --git a/media/libaom/src/test/sb_multipass_test.cc b/libs/libaom/src/test/sb_multipass_test.cc
index 0ca76ab85..0ca76ab85 100644
--- a/media/libaom/src/test/sb_multipass_test.cc
+++ b/libs/libaom/src/test/sb_multipass_test.cc
diff --git a/media/libaom/src/test/scalability_test.cc b/libs/libaom/src/test/scalability_test.cc
index b39918861..b39918861 100644
--- a/media/libaom/src/test/scalability_test.cc
+++ b/libs/libaom/src/test/scalability_test.cc
diff --git a/media/libaom/src/test/scan_test.cc b/libs/libaom/src/test/scan_test.cc
index dee2ab5a6..dee2ab5a6 100644
--- a/media/libaom/src/test/scan_test.cc
+++ b/libs/libaom/src/test/scan_test.cc
diff --git a/media/libaom/src/test/segment_binarization_sync.cc b/libs/libaom/src/test/segment_binarization_sync.cc
index bd8cf1141..bd8cf1141 100644
--- a/media/libaom/src/test/segment_binarization_sync.cc
+++ b/libs/libaom/src/test/segment_binarization_sync.cc
diff --git a/media/libaom/src/test/selfguided_filter_test.cc b/libs/libaom/src/test/selfguided_filter_test.cc
index d65cce58a..d65cce58a 100644
--- a/media/libaom/src/test/selfguided_filter_test.cc
+++ b/libs/libaom/src/test/selfguided_filter_test.cc
diff --git a/media/libaom/src/test/set_maps.sh b/libs/libaom/src/test/set_maps.sh
index 4f59b06d6..4f59b06d6 100644
--- a/media/libaom/src/test/set_maps.sh
+++ b/libs/libaom/src/test/set_maps.sh
diff --git a/media/libaom/src/test/simd_avx2_test.cc b/libs/libaom/src/test/simd_avx2_test.cc
index 8a012bff8..8a012bff8 100644
--- a/media/libaom/src/test/simd_avx2_test.cc
+++ b/libs/libaom/src/test/simd_avx2_test.cc
diff --git a/media/libaom/src/test/simd_cmp_avx2.cc b/libs/libaom/src/test/simd_cmp_avx2.cc
index cda632bcd..cda632bcd 100644
--- a/media/libaom/src/test/simd_cmp_avx2.cc
+++ b/libs/libaom/src/test/simd_cmp_avx2.cc
diff --git a/media/libaom/src/test/simd_cmp_impl.h b/libs/libaom/src/test/simd_cmp_impl.h
index d3eb33619..d3eb33619 100644
--- a/media/libaom/src/test/simd_cmp_impl.h
+++ b/libs/libaom/src/test/simd_cmp_impl.h
diff --git a/media/libaom/src/test/simd_cmp_neon.cc b/libs/libaom/src/test/simd_cmp_neon.cc
index 53c1e2a07..53c1e2a07 100644
--- a/media/libaom/src/test/simd_cmp_neon.cc
+++ b/libs/libaom/src/test/simd_cmp_neon.cc
diff --git a/media/libaom/src/test/simd_cmp_sse2.cc b/libs/libaom/src/test/simd_cmp_sse2.cc
index f7827a7fa..f7827a7fa 100644
--- a/media/libaom/src/test/simd_cmp_sse2.cc
+++ b/libs/libaom/src/test/simd_cmp_sse2.cc
diff --git a/media/libaom/src/test/simd_cmp_sse4.cc b/libs/libaom/src/test/simd_cmp_sse4.cc
index 3566764b6..3566764b6 100644
--- a/media/libaom/src/test/simd_cmp_sse4.cc
+++ b/libs/libaom/src/test/simd_cmp_sse4.cc
diff --git a/media/libaom/src/test/simd_cmp_ssse3.cc b/libs/libaom/src/test/simd_cmp_ssse3.cc
index 57bf135dd..57bf135dd 100644
--- a/media/libaom/src/test/simd_cmp_ssse3.cc
+++ b/libs/libaom/src/test/simd_cmp_ssse3.cc
diff --git a/media/libaom/src/test/simd_impl.h b/libs/libaom/src/test/simd_impl.h
index 61fda009f..61fda009f 100644
--- a/media/libaom/src/test/simd_impl.h
+++ b/libs/libaom/src/test/simd_impl.h
diff --git a/media/libaom/src/test/simd_neon_test.cc b/libs/libaom/src/test/simd_neon_test.cc
index b67b18895..b67b18895 100644
--- a/media/libaom/src/test/simd_neon_test.cc
+++ b/libs/libaom/src/test/simd_neon_test.cc
diff --git a/media/libaom/src/test/simd_sse2_test.cc b/libs/libaom/src/test/simd_sse2_test.cc
index b37a931b3..b37a931b3 100644
--- a/media/libaom/src/test/simd_sse2_test.cc
+++ b/libs/libaom/src/test/simd_sse2_test.cc
diff --git a/media/libaom/src/test/simd_sse4_test.cc b/libs/libaom/src/test/simd_sse4_test.cc
index b1c9d5cd8..b1c9d5cd8 100644
--- a/media/libaom/src/test/simd_sse4_test.cc
+++ b/libs/libaom/src/test/simd_sse4_test.cc
diff --git a/media/libaom/src/test/simd_ssse3_test.cc b/libs/libaom/src/test/simd_ssse3_test.cc
index d95c26fb5..d95c26fb5 100644
--- a/media/libaom/src/test/simd_ssse3_test.cc
+++ b/libs/libaom/src/test/simd_ssse3_test.cc
diff --git a/media/libaom/src/test/simple_decoder.sh b/libs/libaom/src/test/simple_decoder.sh
index 5f39ad206..5f39ad206 100644
--- a/media/libaom/src/test/simple_decoder.sh
+++ b/libs/libaom/src/test/simple_decoder.sh
diff --git a/media/libaom/src/test/simple_encoder.sh b/libs/libaom/src/test/simple_encoder.sh
index 5cd6b46a1..5cd6b46a1 100644
--- a/media/libaom/src/test/simple_encoder.sh
+++ b/libs/libaom/src/test/simple_encoder.sh
diff --git a/media/libaom/src/test/subtract_test.cc b/libs/libaom/src/test/subtract_test.cc
index 4001e8b7a..4001e8b7a 100644
--- a/media/libaom/src/test/subtract_test.cc
+++ b/libs/libaom/src/test/subtract_test.cc
diff --git a/media/libaom/src/test/sum_squares_test.cc b/libs/libaom/src/test/sum_squares_test.cc
index 8845466b8..8845466b8 100644
--- a/media/libaom/src/test/sum_squares_test.cc
+++ b/libs/libaom/src/test/sum_squares_test.cc
diff --git a/media/libaom/src/test/superframe_test.cc b/libs/libaom/src/test/superframe_test.cc
index 024a18b97..024a18b97 100644
--- a/media/libaom/src/test/superframe_test.cc
+++ b/libs/libaom/src/test/superframe_test.cc
diff --git a/media/libaom/src/test/svc_datarate_test.cc b/libs/libaom/src/test/svc_datarate_test.cc
index 28e517ba1..28e517ba1 100644
--- a/media/libaom/src/test/svc_datarate_test.cc
+++ b/libs/libaom/src/test/svc_datarate_test.cc
diff --git a/media/libaom/src/test/temporal_filter_planewise_test.cc b/libs/libaom/src/test/temporal_filter_planewise_test.cc
index c3f3e9e05..c3f3e9e05 100644
--- a/media/libaom/src/test/temporal_filter_planewise_test.cc
+++ b/libs/libaom/src/test/temporal_filter_planewise_test.cc
diff --git a/media/libaom/src/test/temporal_filter_yuv_test.cc b/libs/libaom/src/test/temporal_filter_yuv_test.cc
index dc17aaaf7..dc17aaaf7 100644
--- a/media/libaom/src/test/temporal_filter_yuv_test.cc
+++ b/libs/libaom/src/test/temporal_filter_yuv_test.cc
diff --git a/media/libaom/src/test/test-data.sha1 b/libs/libaom/src/test/test-data.sha1
index 383ae79c1..383ae79c1 100644
--- a/media/libaom/src/test/test-data.sha1
+++ b/libs/libaom/src/test/test-data.sha1
diff --git a/media/libaom/src/test/test.cmake b/libs/libaom/src/test/test.cmake
index d4d3b298d..d4d3b298d 100644
--- a/media/libaom/src/test/test.cmake
+++ b/libs/libaom/src/test/test.cmake
diff --git a/media/libaom/src/test/test_data_download_worker.cmake b/libs/libaom/src/test/test_data_download_worker.cmake
index a49038888..a49038888 100644
--- a/media/libaom/src/test/test_data_download_worker.cmake
+++ b/libs/libaom/src/test/test_data_download_worker.cmake
diff --git a/media/libaom/src/test/test_data_util.cmake b/libs/libaom/src/test/test_data_util.cmake
index 050600e13..050600e13 100644
--- a/media/libaom/src/test/test_data_util.cmake
+++ b/libs/libaom/src/test/test_data_util.cmake
diff --git a/media/libaom/src/test/test_intra_pred_speed.cc b/libs/libaom/src/test/test_intra_pred_speed.cc
index 25c50d022..25c50d022 100644
--- a/media/libaom/src/test/test_intra_pred_speed.cc
+++ b/libs/libaom/src/test/test_intra_pred_speed.cc
diff --git a/media/libaom/src/test/test_libaom.cc b/libs/libaom/src/test/test_libaom.cc
index b55d76237..b55d76237 100644
--- a/media/libaom/src/test/test_libaom.cc
+++ b/libs/libaom/src/test/test_libaom.cc
diff --git a/media/libaom/src/test/test_runner.cmake b/libs/libaom/src/test/test_runner.cmake
index f0648d16b..f0648d16b 100644
--- a/media/libaom/src/test/test_runner.cmake
+++ b/libs/libaom/src/test/test_runner.cmake
diff --git a/media/libaom/src/test/test_vector_test.cc b/libs/libaom/src/test/test_vector_test.cc
index eab92b685..eab92b685 100644
--- a/media/libaom/src/test/test_vector_test.cc
+++ b/libs/libaom/src/test/test_vector_test.cc
diff --git a/media/libaom/src/test/test_vectors.cc b/libs/libaom/src/test/test_vectors.cc
index 991667a08..991667a08 100644
--- a/media/libaom/src/test/test_vectors.cc
+++ b/libs/libaom/src/test/test_vectors.cc
diff --git a/media/libaom/src/test/test_vectors.h b/libs/libaom/src/test/test_vectors.h
index be37f6e37..be37f6e37 100644
--- a/media/libaom/src/test/test_vectors.h
+++ b/libs/libaom/src/test/test_vectors.h
diff --git a/media/libaom/src/test/tile_independence_test.cc b/libs/libaom/src/test/tile_independence_test.cc
index 4f7c4a475..4f7c4a475 100644
--- a/media/libaom/src/test/tile_independence_test.cc
+++ b/libs/libaom/src/test/tile_independence_test.cc
diff --git a/media/libaom/src/test/time_stamp_test.cc b/libs/libaom/src/test/time_stamp_test.cc
index 679e4da29..679e4da29 100644
--- a/media/libaom/src/test/time_stamp_test.cc
+++ b/libs/libaom/src/test/time_stamp_test.cc
diff --git a/media/libaom/src/test/tools_common.sh b/libs/libaom/src/test/tools_common.sh
index c08710606..c08710606 100644
--- a/media/libaom/src/test/tools_common.sh
+++ b/libs/libaom/src/test/tools_common.sh
diff --git a/media/libaom/src/test/transform_test_base.h b/libs/libaom/src/test/transform_test_base.h
index 68f5cc74d..68f5cc74d 100644
--- a/media/libaom/src/test/transform_test_base.h
+++ b/libs/libaom/src/test/transform_test_base.h
diff --git a/media/libaom/src/test/twopass_encoder.sh b/libs/libaom/src/test/twopass_encoder.sh
index cca44ced8..cca44ced8 100644
--- a/media/libaom/src/test/twopass_encoder.sh
+++ b/libs/libaom/src/test/twopass_encoder.sh
diff --git a/media/libaom/src/test/util.h b/libs/libaom/src/test/util.h
index aa4b106e4..aa4b106e4 100644
--- a/media/libaom/src/test/util.h
+++ b/libs/libaom/src/test/util.h
diff --git a/media/libaom/src/test/variance_test.cc b/libs/libaom/src/test/variance_test.cc
index 1458ece28..1458ece28 100644
--- a/media/libaom/src/test/variance_test.cc
+++ b/libs/libaom/src/test/variance_test.cc
diff --git a/media/libaom/src/test/video_source.h b/libs/libaom/src/test/video_source.h
index 3c1c5e559..3c1c5e559 100644
--- a/media/libaom/src/test/video_source.h
+++ b/libs/libaom/src/test/video_source.h
diff --git a/media/libaom/src/test/visual_metrics.py b/libs/libaom/src/test/visual_metrics.py
index 9055feb33..9055feb33 100644
--- a/media/libaom/src/test/visual_metrics.py
+++ b/libs/libaom/src/test/visual_metrics.py
diff --git a/media/libaom/src/test/warp_filter_test.cc b/libs/libaom/src/test/warp_filter_test.cc
index c5e87f085..c5e87f085 100644
--- a/media/libaom/src/test/warp_filter_test.cc
+++ b/libs/libaom/src/test/warp_filter_test.cc
diff --git a/media/libaom/src/test/warp_filter_test_util.cc b/libs/libaom/src/test/warp_filter_test_util.cc
index bcb0c1859..bcb0c1859 100644
--- a/media/libaom/src/test/warp_filter_test_util.cc
+++ b/libs/libaom/src/test/warp_filter_test_util.cc
diff --git a/media/libaom/src/test/warp_filter_test_util.h b/libs/libaom/src/test/warp_filter_test_util.h
index 66a6e244b..66a6e244b 100644
--- a/media/libaom/src/test/warp_filter_test_util.h
+++ b/libs/libaom/src/test/warp_filter_test_util.h
diff --git a/media/libaom/src/test/webm_video_source.h b/libs/libaom/src/test/webm_video_source.h
index bb3d11735..bb3d11735 100644
--- a/media/libaom/src/test/webm_video_source.h
+++ b/libs/libaom/src/test/webm_video_source.h
diff --git a/media/libaom/src/test/wiener_test.cc b/libs/libaom/src/test/wiener_test.cc
index 81839fd56..81839fd56 100644
--- a/media/libaom/src/test/wiener_test.cc
+++ b/libs/libaom/src/test/wiener_test.cc
diff --git a/media/libaom/src/test/y4m_test.cc b/libs/libaom/src/test/y4m_test.cc
index 5d795fad9..5d795fad9 100644
--- a/media/libaom/src/test/y4m_test.cc
+++ b/libs/libaom/src/test/y4m_test.cc
diff --git a/media/libaom/src/test/y4m_video_source.h b/libs/libaom/src/test/y4m_video_source.h
index 63f74f567..63f74f567 100644
--- a/media/libaom/src/test/y4m_video_source.h
+++ b/libs/libaom/src/test/y4m_video_source.h
diff --git a/media/libaom/src/test/yuv_video_source.h b/libs/libaom/src/test/yuv_video_source.h
index 774ecc008..774ecc008 100644
--- a/media/libaom/src/test/yuv_video_source.h
+++ b/libs/libaom/src/test/yuv_video_source.h
diff --git a/media/libaom/src/third_party/fastfeat/LICENSE b/libs/libaom/src/third_party/fastfeat/LICENSE
index f347008d6..f347008d6 100644
--- a/media/libaom/src/third_party/fastfeat/LICENSE
+++ b/libs/libaom/src/third_party/fastfeat/LICENSE
diff --git a/media/libaom/src/third_party/fastfeat/README.libaom b/libs/libaom/src/third_party/fastfeat/README.libaom
index a732b0d93..a732b0d93 100644
--- a/media/libaom/src/third_party/fastfeat/README.libaom
+++ b/libs/libaom/src/third_party/fastfeat/README.libaom
diff --git a/media/libaom/src/third_party/fastfeat/fast.c b/libs/libaom/src/third_party/fastfeat/fast.c
index f29ac8f72..f29ac8f72 100644
--- a/media/libaom/src/third_party/fastfeat/fast.c
+++ b/libs/libaom/src/third_party/fastfeat/fast.c
diff --git a/media/libaom/src/third_party/fastfeat/fast.h b/libs/libaom/src/third_party/fastfeat/fast.h
index a65d5a5d1..a65d5a5d1 100644
--- a/media/libaom/src/third_party/fastfeat/fast.h
+++ b/libs/libaom/src/third_party/fastfeat/fast.h
diff --git a/media/libaom/src/third_party/fastfeat/fast_9.c b/libs/libaom/src/third_party/fastfeat/fast_9.c
index 61c654c47..61c654c47 100644
--- a/media/libaom/src/third_party/fastfeat/fast_9.c
+++ b/libs/libaom/src/third_party/fastfeat/fast_9.c
diff --git a/media/libaom/src/third_party/fastfeat/nonmax.c b/libs/libaom/src/third_party/fastfeat/nonmax.c
index 0dbc660cb..0dbc660cb 100644
--- a/media/libaom/src/third_party/fastfeat/nonmax.c
+++ b/libs/libaom/src/third_party/fastfeat/nonmax.c
diff --git a/media/libaom/src/third_party/googletest/README.libaom b/libs/libaom/src/third_party/googletest/README.libaom
index 9b8a86398..9b8a86398 100644
--- a/media/libaom/src/third_party/googletest/README.libaom
+++ b/libs/libaom/src/third_party/googletest/README.libaom
diff --git a/media/libaom/src/third_party/googletest/src/googletest/CHANGES b/libs/libaom/src/third_party/googletest/src/googletest/CHANGES
index 055213242..055213242 100644
--- a/media/libaom/src/third_party/googletest/src/googletest/CHANGES
+++ b/libs/libaom/src/third_party/googletest/src/googletest/CHANGES
diff --git a/media/libaom/src/third_party/googletest/src/googletest/CMakeLists.txt b/libs/libaom/src/third_party/googletest/src/googletest/CMakeLists.txt
index 9ee79408c..9ee79408c 100644
--- a/media/libaom/src/third_party/googletest/src/googletest/CMakeLists.txt
+++ b/libs/libaom/src/third_party/googletest/src/googletest/CMakeLists.txt
diff --git a/media/libaom/src/third_party/googletest/src/googletest/CONTRIBUTORS b/libs/libaom/src/third_party/googletest/src/googletest/CONTRIBUTORS
index feae2fc04..feae2fc04 100644
--- a/media/libaom/src/third_party/googletest/src/googletest/CONTRIBUTORS
+++ b/libs/libaom/src/third_party/googletest/src/googletest/CONTRIBUTORS
diff --git a/media/libaom/src/third_party/googletest/src/googletest/LICENSE b/libs/libaom/src/third_party/googletest/src/googletest/LICENSE
index 1941a11f8..1941a11f8 100644
--- a/media/libaom/src/third_party/googletest/src/googletest/LICENSE
+++ b/libs/libaom/src/third_party/googletest/src/googletest/LICENSE
diff --git a/media/libaom/src/third_party/googletest/src/googletest/README.md b/libs/libaom/src/third_party/googletest/src/googletest/README.md
index e30fe8047..e30fe8047 100644
--- a/media/libaom/src/third_party/googletest/src/googletest/README.md
+++ b/libs/libaom/src/third_party/googletest/src/googletest/README.md
diff --git a/media/libaom/src/third_party/googletest/src/googletest/cmake/Config.cmake.in b/libs/libaom/src/third_party/googletest/src/googletest/cmake/Config.cmake.in
index 12be4498b..12be4498b 100644
--- a/media/libaom/src/third_party/googletest/src/googletest/cmake/Config.cmake.in
+++ b/libs/libaom/src/third_party/googletest/src/googletest/cmake/Config.cmake.in
diff --git a/media/libaom/src/third_party/googletest/src/googletest/cmake/gtest.pc.in b/libs/libaom/src/third_party/googletest/src/googletest/cmake/gtest.pc.in
index e7967ad56..e7967ad56 100644
--- a/media/libaom/src/third_party/googletest/src/googletest/cmake/gtest.pc.in
+++ b/libs/libaom/src/third_party/googletest/src/googletest/cmake/gtest.pc.in
diff --git a/media/libaom/src/third_party/googletest/src/googletest/cmake/gtest_main.pc.in b/libs/libaom/src/third_party/googletest/src/googletest/cmake/gtest_main.pc.in
index fe25d9c73..fe25d9c73 100644
--- a/media/libaom/src/third_party/googletest/src/googletest/cmake/gtest_main.pc.in
+++ b/libs/libaom/src/third_party/googletest/src/googletest/cmake/gtest_main.pc.in
diff --git a/media/libaom/src/third_party/googletest/src/googletest/cmake/internal_utils.cmake b/libs/libaom/src/third_party/googletest/src/googletest/cmake/internal_utils.cmake
index 8c1f9ba99..8c1f9ba99 100644
--- a/media/libaom/src/third_party/googletest/src/googletest/cmake/internal_utils.cmake
+++ b/libs/libaom/src/third_party/googletest/src/googletest/cmake/internal_utils.cmake
diff --git a/media/libaom/src/third_party/googletest/src/googletest/include/gtest/gtest-death-test.h b/libs/libaom/src/third_party/googletest/src/googletest/include/gtest/gtest-death-test.h
index 39f0ded1b..39f0ded1b 100644
--- a/media/libaom/src/third_party/googletest/src/googletest/include/gtest/gtest-death-test.h
+++ b/libs/libaom/src/third_party/googletest/src/googletest/include/gtest/gtest-death-test.h
diff --git a/media/libaom/src/third_party/googletest/src/googletest/include/gtest/gtest-matchers.h b/libs/libaom/src/third_party/googletest/src/googletest/include/gtest/gtest-matchers.h
index 20be24f43..20be24f43 100644
--- a/media/libaom/src/third_party/googletest/src/googletest/include/gtest/gtest-matchers.h
+++ b/libs/libaom/src/third_party/googletest/src/googletest/include/gtest/gtest-matchers.h
diff --git a/media/libaom/src/third_party/googletest/src/googletest/include/gtest/gtest-message.h b/libs/libaom/src/third_party/googletest/src/googletest/include/gtest/gtest-message.h
index 713facae8..713facae8 100644
--- a/media/libaom/src/third_party/googletest/src/googletest/include/gtest/gtest-message.h
+++ b/libs/libaom/src/third_party/googletest/src/googletest/include/gtest/gtest-message.h
diff --git a/media/libaom/src/third_party/googletest/src/googletest/include/gtest/gtest-param-test.h b/libs/libaom/src/third_party/googletest/src/googletest/include/gtest/gtest-param-test.h
index 8d01df525..8d01df525 100644
--- a/media/libaom/src/third_party/googletest/src/googletest/include/gtest/gtest-param-test.h
+++ b/libs/libaom/src/third_party/googletest/src/googletest/include/gtest/gtest-param-test.h
diff --git a/media/libaom/src/third_party/googletest/src/googletest/include/gtest/gtest-printers.h b/libs/libaom/src/third_party/googletest/src/googletest/include/gtest/gtest-printers.h
index 950247cf6..950247cf6 100644
--- a/media/libaom/src/third_party/googletest/src/googletest/include/gtest/gtest-printers.h
+++ b/libs/libaom/src/third_party/googletest/src/googletest/include/gtest/gtest-printers.h
diff --git a/media/libaom/src/third_party/googletest/src/googletest/include/gtest/gtest-spi.h b/libs/libaom/src/third_party/googletest/src/googletest/include/gtest/gtest-spi.h
index e263b1033..e263b1033 100644
--- a/media/libaom/src/third_party/googletest/src/googletest/include/gtest/gtest-spi.h
+++ b/libs/libaom/src/third_party/googletest/src/googletest/include/gtest/gtest-spi.h
diff --git a/media/libaom/src/third_party/googletest/src/googletest/include/gtest/gtest-test-part.h b/libs/libaom/src/third_party/googletest/src/googletest/include/gtest/gtest-test-part.h
index a28afb309..a28afb309 100644
--- a/media/libaom/src/third_party/googletest/src/googletest/include/gtest/gtest-test-part.h
+++ b/libs/libaom/src/third_party/googletest/src/googletest/include/gtest/gtest-test-part.h
diff --git a/media/libaom/src/third_party/googletest/src/googletest/include/gtest/gtest-typed-test.h b/libs/libaom/src/third_party/googletest/src/googletest/include/gtest/gtest-typed-test.h
index f5afc4db8..f5afc4db8 100644
--- a/media/libaom/src/third_party/googletest/src/googletest/include/gtest/gtest-typed-test.h
+++ b/libs/libaom/src/third_party/googletest/src/googletest/include/gtest/gtest-typed-test.h
diff --git a/media/libaom/src/third_party/googletest/src/googletest/include/gtest/gtest.h b/libs/libaom/src/third_party/googletest/src/googletest/include/gtest/gtest.h
index 8fd7eea1e..8fd7eea1e 100644
--- a/media/libaom/src/third_party/googletest/src/googletest/include/gtest/gtest.h
+++ b/libs/libaom/src/third_party/googletest/src/googletest/include/gtest/gtest.h
diff --git a/media/libaom/src/third_party/googletest/src/googletest/include/gtest/gtest_pred_impl.h b/libs/libaom/src/third_party/googletest/src/googletest/include/gtest/gtest_pred_impl.h
index 1fc21910b..1fc21910b 100644
--- a/media/libaom/src/third_party/googletest/src/googletest/include/gtest/gtest_pred_impl.h
+++ b/libs/libaom/src/third_party/googletest/src/googletest/include/gtest/gtest_pred_impl.h
diff --git a/media/libaom/src/third_party/googletest/src/googletest/include/gtest/gtest_prod.h b/libs/libaom/src/third_party/googletest/src/googletest/include/gtest/gtest_prod.h
index 3dc5b2386..3dc5b2386 100644
--- a/media/libaom/src/third_party/googletest/src/googletest/include/gtest/gtest_prod.h
+++ b/libs/libaom/src/third_party/googletest/src/googletest/include/gtest/gtest_prod.h
diff --git a/media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/custom/README.md b/libs/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/custom/README.md
index ff391fb4e..ff391fb4e 100644
--- a/media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/custom/README.md
+++ b/libs/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/custom/README.md
diff --git a/media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/custom/gtest-port.h b/libs/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/custom/gtest-port.h
index cd85d956d..cd85d956d 100644
--- a/media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/custom/gtest-port.h
+++ b/libs/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/custom/gtest-port.h
diff --git a/media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/custom/gtest-printers.h b/libs/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/custom/gtest-printers.h
index eb4467abc..eb4467abc 100644
--- a/media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/custom/gtest-printers.h
+++ b/libs/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/custom/gtest-printers.h
diff --git a/media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/custom/gtest.h b/libs/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/custom/gtest.h
index 4c8e07be2..4c8e07be2 100644
--- a/media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/custom/gtest.h
+++ b/libs/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/custom/gtest.h
diff --git a/media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/gtest-death-test-internal.h b/libs/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/gtest-death-test-internal.h
index 3e9497d45..3e9497d45 100644
--- a/media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/gtest-death-test-internal.h
+++ b/libs/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/gtest-death-test-internal.h
diff --git a/media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/gtest-filepath.h b/libs/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/gtest-filepath.h
index b228d4734..b228d4734 100644
--- a/media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/gtest-filepath.h
+++ b/libs/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/gtest-filepath.h
diff --git a/media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/gtest-internal.h b/libs/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/gtest-internal.h
index 9640aba83..9640aba83 100644
--- a/media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/gtest-internal.h
+++ b/libs/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/gtest-internal.h
diff --git a/media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/gtest-param-util.h b/libs/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/gtest-param-util.h
index 0d8fc71ce..0d8fc71ce 100644
--- a/media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/gtest-param-util.h
+++ b/libs/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/gtest-param-util.h
diff --git a/media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/gtest-port-arch.h b/libs/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/gtest-port-arch.h
index f803a19be..f803a19be 100644
--- a/media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/gtest-port-arch.h
+++ b/libs/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/gtest-port-arch.h
diff --git a/media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/gtest-port.h b/libs/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/gtest-port.h
index 083da569f..083da569f 100644
--- a/media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/gtest-port.h
+++ b/libs/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/gtest-port.h
diff --git a/media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/gtest-string.h b/libs/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/gtest-string.h
index f1f933097..f1f933097 100644
--- a/media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/gtest-string.h
+++ b/libs/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/gtest-string.h
diff --git a/media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/gtest-type-util.h b/libs/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/gtest-type-util.h
index 3b3a651dc..3b3a651dc 100644
--- a/media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/gtest-type-util.h
+++ b/libs/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/gtest-type-util.h
diff --git a/media/libaom/src/third_party/googletest/src/googletest/src/gtest-all.cc b/libs/libaom/src/third_party/googletest/src/googletest/src/gtest-all.cc
index ad292905c..ad292905c 100644
--- a/media/libaom/src/third_party/googletest/src/googletest/src/gtest-all.cc
+++ b/libs/libaom/src/third_party/googletest/src/googletest/src/gtest-all.cc
diff --git a/media/libaom/src/third_party/googletest/src/googletest/src/gtest-death-test.cc b/libs/libaom/src/third_party/googletest/src/googletest/src/gtest-death-test.cc
index c38551cda..c38551cda 100644
--- a/media/libaom/src/third_party/googletest/src/googletest/src/gtest-death-test.cc
+++ b/libs/libaom/src/third_party/googletest/src/googletest/src/gtest-death-test.cc
diff --git a/media/libaom/src/third_party/googletest/src/googletest/src/gtest-filepath.cc b/libs/libaom/src/third_party/googletest/src/googletest/src/gtest-filepath.cc
index f9427e0f1..f9427e0f1 100644
--- a/media/libaom/src/third_party/googletest/src/googletest/src/gtest-filepath.cc
+++ b/libs/libaom/src/third_party/googletest/src/googletest/src/gtest-filepath.cc
diff --git a/media/libaom/src/third_party/googletest/src/googletest/src/gtest-internal-inl.h b/libs/libaom/src/third_party/googletest/src/googletest/src/gtest-internal-inl.h
index 16d8cde66..16d8cde66 100644
--- a/media/libaom/src/third_party/googletest/src/googletest/src/gtest-internal-inl.h
+++ b/libs/libaom/src/third_party/googletest/src/googletest/src/gtest-internal-inl.h
diff --git a/media/libaom/src/third_party/googletest/src/googletest/src/gtest-matchers.cc b/libs/libaom/src/third_party/googletest/src/googletest/src/gtest-matchers.cc
index 27aaa2b7c..27aaa2b7c 100644
--- a/media/libaom/src/third_party/googletest/src/googletest/src/gtest-matchers.cc
+++ b/libs/libaom/src/third_party/googletest/src/googletest/src/gtest-matchers.cc
diff --git a/media/libaom/src/third_party/googletest/src/googletest/src/gtest-port.cc b/libs/libaom/src/third_party/googletest/src/googletest/src/gtest-port.cc
index adfdbef9c..adfdbef9c 100644
--- a/media/libaom/src/third_party/googletest/src/googletest/src/gtest-port.cc
+++ b/libs/libaom/src/third_party/googletest/src/googletest/src/gtest-port.cc
diff --git a/media/libaom/src/third_party/googletest/src/googletest/src/gtest-printers.cc b/libs/libaom/src/third_party/googletest/src/googletest/src/gtest-printers.cc
index 8399386a9..8399386a9 100644
--- a/media/libaom/src/third_party/googletest/src/googletest/src/gtest-printers.cc
+++ b/libs/libaom/src/third_party/googletest/src/googletest/src/gtest-printers.cc
diff --git a/media/libaom/src/third_party/googletest/src/googletest/src/gtest-test-part.cc b/libs/libaom/src/third_party/googletest/src/googletest/src/gtest-test-part.cc
index 44b0e2b3f..44b0e2b3f 100644
--- a/media/libaom/src/third_party/googletest/src/googletest/src/gtest-test-part.cc
+++ b/libs/libaom/src/third_party/googletest/src/googletest/src/gtest-test-part.cc
diff --git a/media/libaom/src/third_party/googletest/src/googletest/src/gtest-typed-test.cc b/libs/libaom/src/third_party/googletest/src/googletest/src/gtest-typed-test.cc
index 04effad17..04effad17 100644
--- a/media/libaom/src/third_party/googletest/src/googletest/src/gtest-typed-test.cc
+++ b/libs/libaom/src/third_party/googletest/src/googletest/src/gtest-typed-test.cc
diff --git a/media/libaom/src/third_party/googletest/src/googletest/src/gtest.cc b/libs/libaom/src/third_party/googletest/src/googletest/src/gtest.cc
index 5b4037fec..5b4037fec 100644
--- a/media/libaom/src/third_party/googletest/src/googletest/src/gtest.cc
+++ b/libs/libaom/src/third_party/googletest/src/googletest/src/gtest.cc
diff --git a/media/libaom/src/third_party/googletest/src/googletest/src/gtest_main.cc b/libs/libaom/src/third_party/googletest/src/googletest/src/gtest_main.cc
index 77c90ce61..77c90ce61 100644
--- a/media/libaom/src/third_party/googletest/src/googletest/src/gtest_main.cc
+++ b/libs/libaom/src/third_party/googletest/src/googletest/src/gtest_main.cc
diff --git a/media/libaom/src/third_party/libwebm/AUTHORS.TXT b/libs/libaom/src/third_party/libwebm/AUTHORS.TXT
index 9686ac13e..9686ac13e 100644
--- a/media/libaom/src/third_party/libwebm/AUTHORS.TXT
+++ b/libs/libaom/src/third_party/libwebm/AUTHORS.TXT
diff --git a/media/libaom/src/third_party/libwebm/Android.mk b/libs/libaom/src/third_party/libwebm/Android.mk
index b46ba101d..b46ba101d 100644
--- a/media/libaom/src/third_party/libwebm/Android.mk
+++ b/libs/libaom/src/third_party/libwebm/Android.mk
diff --git a/media/libaom/src/third_party/libwebm/LICENSE.TXT b/libs/libaom/src/third_party/libwebm/LICENSE.TXT
index 7a6f99547..7a6f99547 100644
--- a/media/libaom/src/third_party/libwebm/LICENSE.TXT
+++ b/libs/libaom/src/third_party/libwebm/LICENSE.TXT
diff --git a/media/libaom/src/third_party/libwebm/PATENTS.TXT b/libs/libaom/src/third_party/libwebm/PATENTS.TXT
index caedf607e..caedf607e 100644
--- a/media/libaom/src/third_party/libwebm/PATENTS.TXT
+++ b/libs/libaom/src/third_party/libwebm/PATENTS.TXT
diff --git a/media/libaom/src/third_party/libwebm/README.libaom b/libs/libaom/src/third_party/libwebm/README.libaom
index 1e87afd3d..1e87afd3d 100644
--- a/media/libaom/src/third_party/libwebm/README.libaom
+++ b/libs/libaom/src/third_party/libwebm/README.libaom
diff --git a/media/libaom/src/third_party/libwebm/common/file_util.cc b/libs/libaom/src/third_party/libwebm/common/file_util.cc
index 6eb6428b9..6eb6428b9 100644
--- a/media/libaom/src/third_party/libwebm/common/file_util.cc
+++ b/libs/libaom/src/third_party/libwebm/common/file_util.cc
diff --git a/media/libaom/src/third_party/libwebm/common/file_util.h b/libs/libaom/src/third_party/libwebm/common/file_util.h
index a87373464..a87373464 100644
--- a/media/libaom/src/third_party/libwebm/common/file_util.h
+++ b/libs/libaom/src/third_party/libwebm/common/file_util.h
diff --git a/media/libaom/src/third_party/libwebm/common/hdr_util.cc b/libs/libaom/src/third_party/libwebm/common/hdr_util.cc
index 916f7170b..916f7170b 100644
--- a/media/libaom/src/third_party/libwebm/common/hdr_util.cc
+++ b/libs/libaom/src/third_party/libwebm/common/hdr_util.cc
diff --git a/media/libaom/src/third_party/libwebm/common/hdr_util.h b/libs/libaom/src/third_party/libwebm/common/hdr_util.h
index 78e2eeb70..78e2eeb70 100644
--- a/media/libaom/src/third_party/libwebm/common/hdr_util.h
+++ b/libs/libaom/src/third_party/libwebm/common/hdr_util.h
diff --git a/media/libaom/src/third_party/libwebm/common/webmids.h b/libs/libaom/src/third_party/libwebm/common/webmids.h
index fc0c20814..fc0c20814 100644
--- a/media/libaom/src/third_party/libwebm/common/webmids.h
+++ b/libs/libaom/src/third_party/libwebm/common/webmids.h
diff --git a/media/libaom/src/third_party/libwebm/mkvmuxer/mkvmuxer.cc b/libs/libaom/src/third_party/libwebm/mkvmuxer/mkvmuxer.cc
index 512031211..512031211 100644
--- a/media/libaom/src/third_party/libwebm/mkvmuxer/mkvmuxer.cc
+++ b/libs/libaom/src/third_party/libwebm/mkvmuxer/mkvmuxer.cc
diff --git a/media/libaom/src/third_party/libwebm/mkvmuxer/mkvmuxer.h b/libs/libaom/src/third_party/libwebm/mkvmuxer/mkvmuxer.h
index f2db37714..f2db37714 100644
--- a/media/libaom/src/third_party/libwebm/mkvmuxer/mkvmuxer.h
+++ b/libs/libaom/src/third_party/libwebm/mkvmuxer/mkvmuxer.h
diff --git a/media/libaom/src/third_party/libwebm/mkvmuxer/mkvmuxertypes.h b/libs/libaom/src/third_party/libwebm/mkvmuxer/mkvmuxertypes.h
index e5db12160..e5db12160 100644
--- a/media/libaom/src/third_party/libwebm/mkvmuxer/mkvmuxertypes.h
+++ b/libs/libaom/src/third_party/libwebm/mkvmuxer/mkvmuxertypes.h
diff --git a/media/libaom/src/third_party/libwebm/mkvmuxer/mkvmuxerutil.cc b/libs/libaom/src/third_party/libwebm/mkvmuxer/mkvmuxerutil.cc
index 6436817c9..6436817c9 100644
--- a/media/libaom/src/third_party/libwebm/mkvmuxer/mkvmuxerutil.cc
+++ b/libs/libaom/src/third_party/libwebm/mkvmuxer/mkvmuxerutil.cc
diff --git a/media/libaom/src/third_party/libwebm/mkvmuxer/mkvmuxerutil.h b/libs/libaom/src/third_party/libwebm/mkvmuxer/mkvmuxerutil.h
index 3355428bd..3355428bd 100644
--- a/media/libaom/src/third_party/libwebm/mkvmuxer/mkvmuxerutil.h
+++ b/libs/libaom/src/third_party/libwebm/mkvmuxer/mkvmuxerutil.h
diff --git a/media/libaom/src/third_party/libwebm/mkvmuxer/mkvwriter.cc b/libs/libaom/src/third_party/libwebm/mkvmuxer/mkvwriter.cc
index d668384d8..d668384d8 100644
--- a/media/libaom/src/third_party/libwebm/mkvmuxer/mkvwriter.cc
+++ b/libs/libaom/src/third_party/libwebm/mkvmuxer/mkvwriter.cc
diff --git a/media/libaom/src/third_party/libwebm/mkvmuxer/mkvwriter.h b/libs/libaom/src/third_party/libwebm/mkvmuxer/mkvwriter.h
index 4227c6374..4227c6374 100644
--- a/media/libaom/src/third_party/libwebm/mkvmuxer/mkvwriter.h
+++ b/libs/libaom/src/third_party/libwebm/mkvmuxer/mkvwriter.h
diff --git a/media/libaom/src/third_party/libwebm/mkvparser/mkvparser.cc b/libs/libaom/src/third_party/libwebm/mkvparser/mkvparser.cc
index ace65bd59..ace65bd59 100644
--- a/media/libaom/src/third_party/libwebm/mkvparser/mkvparser.cc
+++ b/libs/libaom/src/third_party/libwebm/mkvparser/mkvparser.cc
diff --git a/media/libaom/src/third_party/libwebm/mkvparser/mkvparser.h b/libs/libaom/src/third_party/libwebm/mkvparser/mkvparser.h
index 848d01f03..848d01f03 100644
--- a/media/libaom/src/third_party/libwebm/mkvparser/mkvparser.h
+++ b/libs/libaom/src/third_party/libwebm/mkvparser/mkvparser.h
diff --git a/media/libaom/src/third_party/libwebm/mkvparser/mkvreader.cc b/libs/libaom/src/third_party/libwebm/mkvparser/mkvreader.cc
index 9d19c1be5..9d19c1be5 100644
--- a/media/libaom/src/third_party/libwebm/mkvparser/mkvreader.cc
+++ b/libs/libaom/src/third_party/libwebm/mkvparser/mkvreader.cc
diff --git a/media/libaom/src/third_party/libwebm/mkvparser/mkvreader.h b/libs/libaom/src/third_party/libwebm/mkvparser/mkvreader.h
index 9831ecf64..9831ecf64 100644
--- a/media/libaom/src/third_party/libwebm/mkvparser/mkvreader.h
+++ b/libs/libaom/src/third_party/libwebm/mkvparser/mkvreader.h
diff --git a/media/libaom/src/third_party/libyuv/README.libaom b/libs/libaom/src/third_party/libyuv/README.libaom
index 09693c1f2..09693c1f2 100644
--- a/media/libaom/src/third_party/libyuv/README.libaom
+++ b/libs/libaom/src/third_party/libyuv/README.libaom
diff --git a/media/libaom/src/third_party/libyuv/include/libyuv/basic_types.h b/libs/libaom/src/third_party/libyuv/include/libyuv/basic_types.h
index 66e68536c..66e68536c 100644
--- a/media/libaom/src/third_party/libyuv/include/libyuv/basic_types.h
+++ b/libs/libaom/src/third_party/libyuv/include/libyuv/basic_types.h
diff --git a/media/libaom/src/third_party/libyuv/include/libyuv/compare.h b/libs/libaom/src/third_party/libyuv/include/libyuv/compare.h
index 2a9f1560c..2a9f1560c 100644
--- a/media/libaom/src/third_party/libyuv/include/libyuv/compare.h
+++ b/libs/libaom/src/third_party/libyuv/include/libyuv/compare.h
diff --git a/media/libaom/src/third_party/libyuv/include/libyuv/convert.h b/libs/libaom/src/third_party/libyuv/include/libyuv/convert.h
index d6f206c10..d6f206c10 100644
--- a/media/libaom/src/third_party/libyuv/include/libyuv/convert.h
+++ b/libs/libaom/src/third_party/libyuv/include/libyuv/convert.h
diff --git a/media/libaom/src/third_party/libyuv/include/libyuv/convert_argb.h b/libs/libaom/src/third_party/libyuv/include/libyuv/convert_argb.h
index ea75c0b26..ea75c0b26 100644
--- a/media/libaom/src/third_party/libyuv/include/libyuv/convert_argb.h
+++ b/libs/libaom/src/third_party/libyuv/include/libyuv/convert_argb.h
diff --git a/media/libaom/src/third_party/libyuv/include/libyuv/convert_from.h b/libs/libaom/src/third_party/libyuv/include/libyuv/convert_from.h
index 3591b4fd6..3591b4fd6 100644
--- a/media/libaom/src/third_party/libyuv/include/libyuv/convert_from.h
+++ b/libs/libaom/src/third_party/libyuv/include/libyuv/convert_from.h
diff --git a/media/libaom/src/third_party/libyuv/include/libyuv/convert_from_argb.h b/libs/libaom/src/third_party/libyuv/include/libyuv/convert_from_argb.h
index 4a6226813..4a6226813 100644
--- a/media/libaom/src/third_party/libyuv/include/libyuv/convert_from_argb.h
+++ b/libs/libaom/src/third_party/libyuv/include/libyuv/convert_from_argb.h
diff --git a/media/libaom/src/third_party/libyuv/include/libyuv/cpu_id.h b/libs/libaom/src/third_party/libyuv/include/libyuv/cpu_id.h
index 870e94e8c..870e94e8c 100644
--- a/media/libaom/src/third_party/libyuv/include/libyuv/cpu_id.h
+++ b/libs/libaom/src/third_party/libyuv/include/libyuv/cpu_id.h
diff --git a/media/libaom/src/third_party/libyuv/include/libyuv/mjpeg_decoder.h b/libs/libaom/src/third_party/libyuv/include/libyuv/mjpeg_decoder.h
index fa1e51f9a..fa1e51f9a 100644
--- a/media/libaom/src/third_party/libyuv/include/libyuv/mjpeg_decoder.h
+++ b/libs/libaom/src/third_party/libyuv/include/libyuv/mjpeg_decoder.h
diff --git a/media/libaom/src/third_party/libyuv/include/libyuv/planar_functions.h b/libs/libaom/src/third_party/libyuv/include/libyuv/planar_functions.h
index 7fe4d8eed..7fe4d8eed 100644
--- a/media/libaom/src/third_party/libyuv/include/libyuv/planar_functions.h
+++ b/libs/libaom/src/third_party/libyuv/include/libyuv/planar_functions.h
diff --git a/media/libaom/src/third_party/libyuv/include/libyuv/rotate.h b/libs/libaom/src/third_party/libyuv/include/libyuv/rotate.h
index 8a9673f28..8a9673f28 100644
--- a/media/libaom/src/third_party/libyuv/include/libyuv/rotate.h
+++ b/libs/libaom/src/third_party/libyuv/include/libyuv/rotate.h
diff --git a/media/libaom/src/third_party/libyuv/include/libyuv/rotate_argb.h b/libs/libaom/src/third_party/libyuv/include/libyuv/rotate_argb.h
index 2bdc8ec6b..2bdc8ec6b 100644
--- a/media/libaom/src/third_party/libyuv/include/libyuv/rotate_argb.h
+++ b/libs/libaom/src/third_party/libyuv/include/libyuv/rotate_argb.h
diff --git a/media/libaom/src/third_party/libyuv/include/libyuv/rotate_row.h b/libs/libaom/src/third_party/libyuv/include/libyuv/rotate_row.h
index d0bfbdd2b..d0bfbdd2b 100644
--- a/media/libaom/src/third_party/libyuv/include/libyuv/rotate_row.h
+++ b/libs/libaom/src/third_party/libyuv/include/libyuv/rotate_row.h
diff --git a/media/libaom/src/third_party/libyuv/include/libyuv/row.h b/libs/libaom/src/third_party/libyuv/include/libyuv/row.h
index 5c3187ef7..5c3187ef7 100644
--- a/media/libaom/src/third_party/libyuv/include/libyuv/row.h
+++ b/libs/libaom/src/third_party/libyuv/include/libyuv/row.h
diff --git a/media/libaom/src/third_party/libyuv/include/libyuv/scale.h b/libs/libaom/src/third_party/libyuv/include/libyuv/scale.h
index 3974aba34..3974aba34 100644
--- a/media/libaom/src/third_party/libyuv/include/libyuv/scale.h
+++ b/libs/libaom/src/third_party/libyuv/include/libyuv/scale.h
diff --git a/media/libaom/src/third_party/libyuv/include/libyuv/scale_argb.h b/libs/libaom/src/third_party/libyuv/include/libyuv/scale_argb.h
index 22563837d..22563837d 100644
--- a/media/libaom/src/third_party/libyuv/include/libyuv/scale_argb.h
+++ b/libs/libaom/src/third_party/libyuv/include/libyuv/scale_argb.h
diff --git a/media/libaom/src/third_party/libyuv/include/libyuv/scale_row.h b/libs/libaom/src/third_party/libyuv/include/libyuv/scale_row.h
index a46b5ce69..a46b5ce69 100644
--- a/media/libaom/src/third_party/libyuv/include/libyuv/scale_row.h
+++ b/libs/libaom/src/third_party/libyuv/include/libyuv/scale_row.h
diff --git a/media/libaom/src/third_party/libyuv/include/libyuv/version.h b/libs/libaom/src/third_party/libyuv/include/libyuv/version.h
index 287b98ebf..287b98ebf 100644
--- a/media/libaom/src/third_party/libyuv/include/libyuv/version.h
+++ b/libs/libaom/src/third_party/libyuv/include/libyuv/version.h
diff --git a/media/libaom/src/third_party/libyuv/include/libyuv/video_common.h b/libs/libaom/src/third_party/libyuv/include/libyuv/video_common.h
index 7b0a19cc9..7b0a19cc9 100644
--- a/media/libaom/src/third_party/libyuv/include/libyuv/video_common.h
+++ b/libs/libaom/src/third_party/libyuv/include/libyuv/video_common.h
diff --git a/media/libaom/src/third_party/libyuv/source/compare.cc b/libs/libaom/src/third_party/libyuv/source/compare.cc
index 46aa8473d..46aa8473d 100644
--- a/media/libaom/src/third_party/libyuv/source/compare.cc
+++ b/libs/libaom/src/third_party/libyuv/source/compare.cc
diff --git a/media/libaom/src/third_party/libyuv/source/compare_common.cc b/libs/libaom/src/third_party/libyuv/source/compare_common.cc
index c546b5182..c546b5182 100644
--- a/media/libaom/src/third_party/libyuv/source/compare_common.cc
+++ b/libs/libaom/src/third_party/libyuv/source/compare_common.cc
diff --git a/media/libaom/src/third_party/libyuv/source/compare_gcc.cc b/libs/libaom/src/third_party/libyuv/source/compare_gcc.cc
index 247cb33bb..247cb33bb 100644
--- a/media/libaom/src/third_party/libyuv/source/compare_gcc.cc
+++ b/libs/libaom/src/third_party/libyuv/source/compare_gcc.cc
diff --git a/media/libaom/src/third_party/libyuv/source/compare_neon.cc b/libs/libaom/src/third_party/libyuv/source/compare_neon.cc
index ef006ec41..ef006ec41 100644
--- a/media/libaom/src/third_party/libyuv/source/compare_neon.cc
+++ b/libs/libaom/src/third_party/libyuv/source/compare_neon.cc
diff --git a/media/libaom/src/third_party/libyuv/source/compare_neon64.cc b/libs/libaom/src/third_party/libyuv/source/compare_neon64.cc
index 6d1e5e1bc..6d1e5e1bc 100644
--- a/media/libaom/src/third_party/libyuv/source/compare_neon64.cc
+++ b/libs/libaom/src/third_party/libyuv/source/compare_neon64.cc
diff --git a/media/libaom/src/third_party/libyuv/source/compare_win.cc b/libs/libaom/src/third_party/libyuv/source/compare_win.cc
index 19806f275..19806f275 100644
--- a/media/libaom/src/third_party/libyuv/source/compare_win.cc
+++ b/libs/libaom/src/third_party/libyuv/source/compare_win.cc
diff --git a/media/libaom/src/third_party/libyuv/source/convert.cc b/libs/libaom/src/third_party/libyuv/source/convert.cc
index 3ad6bd7a4..3ad6bd7a4 100644
--- a/media/libaom/src/third_party/libyuv/source/convert.cc
+++ b/libs/libaom/src/third_party/libyuv/source/convert.cc
diff --git a/media/libaom/src/third_party/libyuv/source/convert_argb.cc b/libs/libaom/src/third_party/libyuv/source/convert_argb.cc
index 44756bc41..44756bc41 100644
--- a/media/libaom/src/third_party/libyuv/source/convert_argb.cc
+++ b/libs/libaom/src/third_party/libyuv/source/convert_argb.cc
diff --git a/media/libaom/src/third_party/libyuv/source/convert_from.cc b/libs/libaom/src/third_party/libyuv/source/convert_from.cc
index 31f1ac992..31f1ac992 100644
--- a/media/libaom/src/third_party/libyuv/source/convert_from.cc
+++ b/libs/libaom/src/third_party/libyuv/source/convert_from.cc
diff --git a/media/libaom/src/third_party/libyuv/source/convert_from_argb.cc b/libs/libaom/src/third_party/libyuv/source/convert_from_argb.cc
index 8d1e97aec..8d1e97aec 100644
--- a/media/libaom/src/third_party/libyuv/source/convert_from_argb.cc
+++ b/libs/libaom/src/third_party/libyuv/source/convert_from_argb.cc
diff --git a/media/libaom/src/third_party/libyuv/source/convert_jpeg.cc b/libs/libaom/src/third_party/libyuv/source/convert_jpeg.cc
index bcb980f7f..bcb980f7f 100644
--- a/media/libaom/src/third_party/libyuv/source/convert_jpeg.cc
+++ b/libs/libaom/src/third_party/libyuv/source/convert_jpeg.cc
diff --git a/media/libaom/src/third_party/libyuv/source/convert_to_argb.cc b/libs/libaom/src/third_party/libyuv/source/convert_to_argb.cc
index af829fbd3..af829fbd3 100644
--- a/media/libaom/src/third_party/libyuv/source/convert_to_argb.cc
+++ b/libs/libaom/src/third_party/libyuv/source/convert_to_argb.cc
diff --git a/media/libaom/src/third_party/libyuv/source/convert_to_i420.cc b/libs/libaom/src/third_party/libyuv/source/convert_to_i420.cc
index 5e75369b5..5e75369b5 100644
--- a/media/libaom/src/third_party/libyuv/source/convert_to_i420.cc
+++ b/libs/libaom/src/third_party/libyuv/source/convert_to_i420.cc
diff --git a/media/libaom/src/third_party/libyuv/source/cpu_id.cc b/libs/libaom/src/third_party/libyuv/source/cpu_id.cc
index 72f686e3b..72f686e3b 100644
--- a/media/libaom/src/third_party/libyuv/source/cpu_id.cc
+++ b/libs/libaom/src/third_party/libyuv/source/cpu_id.cc
diff --git a/media/libaom/src/third_party/libyuv/source/mjpeg_decoder.cc b/libs/libaom/src/third_party/libyuv/source/mjpeg_decoder.cc
index 75f8a610e..75f8a610e 100644
--- a/media/libaom/src/third_party/libyuv/source/mjpeg_decoder.cc
+++ b/libs/libaom/src/third_party/libyuv/source/mjpeg_decoder.cc
diff --git a/media/libaom/src/third_party/libyuv/source/mjpeg_validate.cc b/libs/libaom/src/third_party/libyuv/source/mjpeg_validate.cc
index 8edfbe1e7..8edfbe1e7 100644
--- a/media/libaom/src/third_party/libyuv/source/mjpeg_validate.cc
+++ b/libs/libaom/src/third_party/libyuv/source/mjpeg_validate.cc
diff --git a/media/libaom/src/third_party/libyuv/source/planar_functions.cc b/libs/libaom/src/third_party/libyuv/source/planar_functions.cc
index b96bd5020..b96bd5020 100644
--- a/media/libaom/src/third_party/libyuv/source/planar_functions.cc
+++ b/libs/libaom/src/third_party/libyuv/source/planar_functions.cc
diff --git a/media/libaom/src/third_party/libyuv/source/rotate.cc b/libs/libaom/src/third_party/libyuv/source/rotate.cc
index be3d58920..be3d58920 100644
--- a/media/libaom/src/third_party/libyuv/source/rotate.cc
+++ b/libs/libaom/src/third_party/libyuv/source/rotate.cc
diff --git a/media/libaom/src/third_party/libyuv/source/rotate_any.cc b/libs/libaom/src/third_party/libyuv/source/rotate_any.cc
index 4d6eb34e1..4d6eb34e1 100644
--- a/media/libaom/src/third_party/libyuv/source/rotate_any.cc
+++ b/libs/libaom/src/third_party/libyuv/source/rotate_any.cc
diff --git a/media/libaom/src/third_party/libyuv/source/rotate_argb.cc b/libs/libaom/src/third_party/libyuv/source/rotate_argb.cc
index 787c0ad1b..787c0ad1b 100644
--- a/media/libaom/src/third_party/libyuv/source/rotate_argb.cc
+++ b/libs/libaom/src/third_party/libyuv/source/rotate_argb.cc
diff --git a/media/libaom/src/third_party/libyuv/source/rotate_common.cc b/libs/libaom/src/third_party/libyuv/source/rotate_common.cc
index b33a9a0c6..b33a9a0c6 100644
--- a/media/libaom/src/third_party/libyuv/source/rotate_common.cc
+++ b/libs/libaom/src/third_party/libyuv/source/rotate_common.cc
diff --git a/media/libaom/src/third_party/libyuv/source/rotate_gcc.cc b/libs/libaom/src/third_party/libyuv/source/rotate_gcc.cc
index fd385bcd3..fd385bcd3 100644
--- a/media/libaom/src/third_party/libyuv/source/rotate_gcc.cc
+++ b/libs/libaom/src/third_party/libyuv/source/rotate_gcc.cc
diff --git a/media/libaom/src/third_party/libyuv/source/rotate_mips.cc b/libs/libaom/src/third_party/libyuv/source/rotate_mips.cc
index efe6bd909..efe6bd909 100644
--- a/media/libaom/src/third_party/libyuv/source/rotate_mips.cc
+++ b/libs/libaom/src/third_party/libyuv/source/rotate_mips.cc
diff --git a/media/libaom/src/third_party/libyuv/source/rotate_neon.cc b/libs/libaom/src/third_party/libyuv/source/rotate_neon.cc
index 76043b3b3..76043b3b3 100644
--- a/media/libaom/src/third_party/libyuv/source/rotate_neon.cc
+++ b/libs/libaom/src/third_party/libyuv/source/rotate_neon.cc
diff --git a/media/libaom/src/third_party/libyuv/source/rotate_neon64.cc b/libs/libaom/src/third_party/libyuv/source/rotate_neon64.cc
index f52c082b3..f52c082b3 100644
--- a/media/libaom/src/third_party/libyuv/source/rotate_neon64.cc
+++ b/libs/libaom/src/third_party/libyuv/source/rotate_neon64.cc
diff --git a/media/libaom/src/third_party/libyuv/source/rotate_win.cc b/libs/libaom/src/third_party/libyuv/source/rotate_win.cc
index 2760066df..2760066df 100644
--- a/media/libaom/src/third_party/libyuv/source/rotate_win.cc
+++ b/libs/libaom/src/third_party/libyuv/source/rotate_win.cc
diff --git a/media/libaom/src/third_party/libyuv/source/row_any.cc b/libs/libaom/src/third_party/libyuv/source/row_any.cc
index 1cb1f6b93..1cb1f6b93 100644
--- a/media/libaom/src/third_party/libyuv/source/row_any.cc
+++ b/libs/libaom/src/third_party/libyuv/source/row_any.cc
diff --git a/media/libaom/src/third_party/libyuv/source/row_common.cc b/libs/libaom/src/third_party/libyuv/source/row_common.cc
index 49875894f..49875894f 100644
--- a/media/libaom/src/third_party/libyuv/source/row_common.cc
+++ b/libs/libaom/src/third_party/libyuv/source/row_common.cc
diff --git a/media/libaom/src/third_party/libyuv/source/row_gcc.cc b/libs/libaom/src/third_party/libyuv/source/row_gcc.cc
index 820de0a1c..820de0a1c 100644
--- a/media/libaom/src/third_party/libyuv/source/row_gcc.cc
+++ b/libs/libaom/src/third_party/libyuv/source/row_gcc.cc
diff --git a/media/libaom/src/third_party/libyuv/source/row_mips.cc b/libs/libaom/src/third_party/libyuv/source/row_mips.cc
index cfc9ffe03..cfc9ffe03 100644
--- a/media/libaom/src/third_party/libyuv/source/row_mips.cc
+++ b/libs/libaom/src/third_party/libyuv/source/row_mips.cc
diff --git a/media/libaom/src/third_party/libyuv/source/row_neon.cc b/libs/libaom/src/third_party/libyuv/source/row_neon.cc
index 1a72eb903..1a72eb903 100644
--- a/media/libaom/src/third_party/libyuv/source/row_neon.cc
+++ b/libs/libaom/src/third_party/libyuv/source/row_neon.cc
diff --git a/media/libaom/src/third_party/libyuv/source/row_neon64.cc b/libs/libaom/src/third_party/libyuv/source/row_neon64.cc
index 5d015454b..5d015454b 100644
--- a/media/libaom/src/third_party/libyuv/source/row_neon64.cc
+++ b/libs/libaom/src/third_party/libyuv/source/row_neon64.cc
diff --git a/media/libaom/src/third_party/libyuv/source/row_win.cc b/libs/libaom/src/third_party/libyuv/source/row_win.cc
index 71be268b4..71be268b4 100644
--- a/media/libaom/src/third_party/libyuv/source/row_win.cc
+++ b/libs/libaom/src/third_party/libyuv/source/row_win.cc
diff --git a/media/libaom/src/third_party/libyuv/source/row_x86.asm b/libs/libaom/src/third_party/libyuv/source/row_x86.asm
index 0cb326f8e..0cb326f8e 100644
--- a/media/libaom/src/third_party/libyuv/source/row_x86.asm
+++ b/libs/libaom/src/third_party/libyuv/source/row_x86.asm
diff --git a/media/libaom/src/third_party/libyuv/source/scale.cc b/libs/libaom/src/third_party/libyuv/source/scale.cc
index 0a01304c4..0a01304c4 100644
--- a/media/libaom/src/third_party/libyuv/source/scale.cc
+++ b/libs/libaom/src/third_party/libyuv/source/scale.cc
diff --git a/media/libaom/src/third_party/libyuv/source/scale_any.cc b/libs/libaom/src/third_party/libyuv/source/scale_any.cc
index 2f6a2c8ba..2f6a2c8ba 100644
--- a/media/libaom/src/third_party/libyuv/source/scale_any.cc
+++ b/libs/libaom/src/third_party/libyuv/source/scale_any.cc
diff --git a/media/libaom/src/third_party/libyuv/source/scale_argb.cc b/libs/libaom/src/third_party/libyuv/source/scale_argb.cc
index 40a2d1ab2..40a2d1ab2 100644
--- a/media/libaom/src/third_party/libyuv/source/scale_argb.cc
+++ b/libs/libaom/src/third_party/libyuv/source/scale_argb.cc
diff --git a/media/libaom/src/third_party/libyuv/source/scale_common.cc b/libs/libaom/src/third_party/libyuv/source/scale_common.cc
index 1711f3d54..1711f3d54 100644
--- a/media/libaom/src/third_party/libyuv/source/scale_common.cc
+++ b/libs/libaom/src/third_party/libyuv/source/scale_common.cc
diff --git a/media/libaom/src/third_party/libyuv/source/scale_gcc.cc b/libs/libaom/src/third_party/libyuv/source/scale_gcc.cc
index 8a6ac5459..8a6ac5459 100644
--- a/media/libaom/src/third_party/libyuv/source/scale_gcc.cc
+++ b/libs/libaom/src/third_party/libyuv/source/scale_gcc.cc
diff --git a/media/libaom/src/third_party/libyuv/source/scale_mips.cc b/libs/libaom/src/third_party/libyuv/source/scale_mips.cc
index 3eb4f27c4..3eb4f27c4 100644
--- a/media/libaom/src/third_party/libyuv/source/scale_mips.cc
+++ b/libs/libaom/src/third_party/libyuv/source/scale_mips.cc
diff --git a/media/libaom/src/third_party/libyuv/source/scale_neon.cc b/libs/libaom/src/third_party/libyuv/source/scale_neon.cc
index 7825878e9..7825878e9 100644
--- a/media/libaom/src/third_party/libyuv/source/scale_neon.cc
+++ b/libs/libaom/src/third_party/libyuv/source/scale_neon.cc
diff --git a/media/libaom/src/third_party/libyuv/source/scale_neon64.cc b/libs/libaom/src/third_party/libyuv/source/scale_neon64.cc
index 1d5519357..1d5519357 100644
--- a/media/libaom/src/third_party/libyuv/source/scale_neon64.cc
+++ b/libs/libaom/src/third_party/libyuv/source/scale_neon64.cc
diff --git a/media/libaom/src/third_party/libyuv/source/scale_win.cc b/libs/libaom/src/third_party/libyuv/source/scale_win.cc
index c3896ebad..c3896ebad 100644
--- a/media/libaom/src/third_party/libyuv/source/scale_win.cc
+++ b/libs/libaom/src/third_party/libyuv/source/scale_win.cc
diff --git a/media/libaom/src/third_party/libyuv/source/video_common.cc b/libs/libaom/src/third_party/libyuv/source/video_common.cc
index 379a0669a..379a0669a 100644
--- a/media/libaom/src/third_party/libyuv/source/video_common.cc
+++ b/libs/libaom/src/third_party/libyuv/source/video_common.cc
diff --git a/media/libaom/src/third_party/libyuv/source/x86inc.asm b/libs/libaom/src/third_party/libyuv/source/x86inc.asm
index cb5c32df3..cb5c32df3 100644
--- a/media/libaom/src/third_party/libyuv/source/x86inc.asm
+++ b/libs/libaom/src/third_party/libyuv/source/x86inc.asm
diff --git a/media/libaom/src/third_party/vector/LICENSE b/libs/libaom/src/third_party/vector/LICENSE
index afcb9f00a..afcb9f00a 100644
--- a/media/libaom/src/third_party/vector/LICENSE
+++ b/libs/libaom/src/third_party/vector/LICENSE
diff --git a/media/libaom/src/third_party/vector/README.libaom b/libs/libaom/src/third_party/vector/README.libaom
index 729446dbc..729446dbc 100644
--- a/media/libaom/src/third_party/vector/README.libaom
+++ b/libs/libaom/src/third_party/vector/README.libaom
diff --git a/media/libaom/src/third_party/vector/vector.c b/libs/libaom/src/third_party/vector/vector.c
index 4b8b9c6fd..4b8b9c6fd 100644
--- a/media/libaom/src/third_party/vector/vector.c
+++ b/libs/libaom/src/third_party/vector/vector.c
diff --git a/media/libaom/src/third_party/vector/vector.h b/libs/libaom/src/third_party/vector/vector.h
index d09eb64c9..d09eb64c9 100644
--- a/media/libaom/src/third_party/vector/vector.h
+++ b/libs/libaom/src/third_party/vector/vector.h
diff --git a/media/libaom/src/third_party/x86inc/LICENSE b/libs/libaom/src/third_party/x86inc/LICENSE
index 7d07645a1..7d07645a1 100644
--- a/media/libaom/src/third_party/x86inc/LICENSE
+++ b/libs/libaom/src/third_party/x86inc/LICENSE
diff --git a/media/libaom/src/third_party/x86inc/README.libaom b/libs/libaom/src/third_party/x86inc/README.libaom
index 07c4dad20..07c4dad20 100644
--- a/media/libaom/src/third_party/x86inc/README.libaom
+++ b/libs/libaom/src/third_party/x86inc/README.libaom
diff --git a/media/libaom/src/third_party/x86inc/x86inc.asm b/libs/libaom/src/third_party/x86inc/x86inc.asm
index adaf2d99e..adaf2d99e 100644
--- a/media/libaom/src/third_party/x86inc/x86inc.asm
+++ b/libs/libaom/src/third_party/x86inc/x86inc.asm
diff --git a/media/libaom/src/tools/aggregate_entropy_stats.py b/libs/libaom/src/tools/aggregate_entropy_stats.py
index 7cb4d18e1..7cb4d18e1 100644
--- a/media/libaom/src/tools/aggregate_entropy_stats.py
+++ b/libs/libaom/src/tools/aggregate_entropy_stats.py
diff --git a/media/libaom/src/tools/aom_entropy_optimizer.c b/libs/libaom/src/tools/aom_entropy_optimizer.c
index 9f529d9ab..9f529d9ab 100644
--- a/media/libaom/src/tools/aom_entropy_optimizer.c
+++ b/libs/libaom/src/tools/aom_entropy_optimizer.c
diff --git a/media/libaom/src/tools/cpplint.py b/libs/libaom/src/tools/cpplint.py
index 25fbef73d..25fbef73d 100644
--- a/media/libaom/src/tools/cpplint.py
+++ b/libs/libaom/src/tools/cpplint.py
diff --git a/media/libaom/src/tools/diff.py b/libs/libaom/src/tools/diff.py
index bac6aabdc..bac6aabdc 100644
--- a/media/libaom/src/tools/diff.py
+++ b/libs/libaom/src/tools/diff.py
diff --git a/media/libaom/src/tools/dump_obu.cc b/libs/libaom/src/tools/dump_obu.cc
index 30ee5e7a1..30ee5e7a1 100644
--- a/media/libaom/src/tools/dump_obu.cc
+++ b/libs/libaom/src/tools/dump_obu.cc
diff --git a/media/libaom/src/tools/gen_authors.sh b/libs/libaom/src/tools/gen_authors.sh
index 5def8bc89..5def8bc89 100644
--- a/media/libaom/src/tools/gen_authors.sh
+++ b/libs/libaom/src/tools/gen_authors.sh
diff --git a/media/libaom/src/tools/gen_constrained_tokenset.py b/libs/libaom/src/tools/gen_constrained_tokenset.py
index 5d12ee1ef..5d12ee1ef 100644
--- a/media/libaom/src/tools/gen_constrained_tokenset.py
+++ b/libs/libaom/src/tools/gen_constrained_tokenset.py
diff --git a/media/libaom/src/tools/inspect-cli.js b/libs/libaom/src/tools/inspect-cli.js
index a14c08111..a14c08111 100644
--- a/media/libaom/src/tools/inspect-cli.js
+++ b/libs/libaom/src/tools/inspect-cli.js
diff --git a/media/libaom/src/tools/inspect-post.js b/libs/libaom/src/tools/inspect-post.js
index 31c40bb82..31c40bb82 100644
--- a/media/libaom/src/tools/inspect-post.js
+++ b/libs/libaom/src/tools/inspect-post.js
diff --git a/media/libaom/src/tools/intersect-diffs.py b/libs/libaom/src/tools/intersect-diffs.py
index df13c4ef7..df13c4ef7 100644
--- a/media/libaom/src/tools/intersect-diffs.py
+++ b/libs/libaom/src/tools/intersect-diffs.py
diff --git a/media/libaom/src/tools/lint-hunks.py b/libs/libaom/src/tools/lint-hunks.py
index d02bee16c..d02bee16c 100644
--- a/media/libaom/src/tools/lint-hunks.py
+++ b/libs/libaom/src/tools/lint-hunks.py
diff --git a/media/libaom/src/tools/obu_parser.cc b/libs/libaom/src/tools/obu_parser.cc
index 7d71386ce..7d71386ce 100644
--- a/media/libaom/src/tools/obu_parser.cc
+++ b/libs/libaom/src/tools/obu_parser.cc
diff --git a/media/libaom/src/tools/obu_parser.h b/libs/libaom/src/tools/obu_parser.h
index 1d7d2d794..1d7d2d794 100644
--- a/media/libaom/src/tools/obu_parser.h
+++ b/libs/libaom/src/tools/obu_parser.h
diff --git a/media/libaom/src/tools/txfm_analyzer/txfm_gen_code.cc b/libs/libaom/src/tools/txfm_analyzer/txfm_gen_code.cc
index 7c5400b91..7c5400b91 100644
--- a/media/libaom/src/tools/txfm_analyzer/txfm_gen_code.cc
+++ b/libs/libaom/src/tools/txfm_analyzer/txfm_gen_code.cc
diff --git a/media/libaom/src/tools/txfm_analyzer/txfm_graph.cc b/libs/libaom/src/tools/txfm_analyzer/txfm_graph.cc
index a24906100..a24906100 100644
--- a/media/libaom/src/tools/txfm_analyzer/txfm_graph.cc
+++ b/libs/libaom/src/tools/txfm_analyzer/txfm_graph.cc
diff --git a/media/libaom/src/tools/txfm_analyzer/txfm_graph.h b/libs/libaom/src/tools/txfm_analyzer/txfm_graph.h
index 8dc36146d..8dc36146d 100644
--- a/media/libaom/src/tools/txfm_analyzer/txfm_graph.h
+++ b/libs/libaom/src/tools/txfm_analyzer/txfm_graph.h
diff --git a/media/libaom/src/tools/wrap-commit-msg.py b/libs/libaom/src/tools/wrap-commit-msg.py
index 1c7882443..1c7882443 100644
--- a/media/libaom/src/tools/wrap-commit-msg.py
+++ b/libs/libaom/src/tools/wrap-commit-msg.py
diff --git a/media/libaom/src/usage.dox b/libs/libaom/src/usage.dox
index 4004f4af5..4004f4af5 100644
--- a/media/libaom/src/usage.dox
+++ b/libs/libaom/src/usage.dox
diff --git a/media/libaom/src/usage_cx.dox b/libs/libaom/src/usage_cx.dox
index 51b4e8e3e..51b4e8e3e 100644
--- a/media/libaom/src/usage_cx.dox
+++ b/libs/libaom/src/usage_cx.dox
diff --git a/media/libaom/src/usage_dx.dox b/libs/libaom/src/usage_dx.dox
index 76dc213bf..76dc213bf 100644
--- a/media/libaom/src/usage_dx.dox
+++ b/libs/libaom/src/usage_dx.dox
diff --git a/media/libaom/test_cmakeparser.py b/libs/libaom/test_cmakeparser.py
index af68c3313..af68c3313 100644
--- a/media/libaom/test_cmakeparser.py
+++ b/libs/libaom/test_cmakeparser.py
diff --git a/libs/moz.build b/libs/moz.build
index 24dfaa269..60be5576a 100644
--- a/libs/moz.build
+++ b/libs/moz.build
@@ -54,6 +54,9 @@ if CONFIG['MOZ_WEBM_ENCODER']:
 if CONFIG['CPU_ARCH'] == 'arm':
     DIRS += ['openmax_dl']
 
+if CONFIG['MOZ_AV1']:
+    DIRS += ['libaom']
+
 # modules
 DIRS += [
     'brotli',
diff --git a/media/libaom/sources.mozbuild b/media/libaom/sources.mozbuild
deleted file mode 100644
index e6ddf7b79..000000000
--- a/media/libaom/sources.mozbuild
+++ /dev/null
@@ -1,544 +0,0 @@
-# This file is generated. Do not edit.
-
-files = {
-  'ARM_EXPORTS': [
-    '/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': [
-    '/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/avg.c',
-    '/media/libaom/src/aom_dsp/binary_codes_reader.c',
-    '/media/libaom/src/aom_dsp/bitreader.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/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/obu.c',
-    '/media/libaom/src/av1/encoder/arm/neon/av1_error_neon.c',
-    '/media/libaom/src/av1/encoder/arm/neon/quantize_neon.c',
-  ],
-  'GENERIC_EXPORTS': [
-    '/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': [
-    '/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/avg.c',
-    '/media/libaom/src/aom_dsp/binary_codes_reader.c',
-    '/media/libaom/src/aom_dsp/bitreader.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/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/obu.c',
-  ],
-  'IA32_EXPORTS': [
-    '/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': [
-    '/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/avg.c',
-    '/media/libaom/src/aom_dsp/binary_codes_reader.c',
-    '/media/libaom/src/aom_dsp/bitreader.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/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_sse2.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/avg_intrin_avx2.c',
-    '/media/libaom/src/aom_dsp/x86/avg_intrin_sse2.c',
-    '/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_sse2.c',
-    '/media/libaom/src/aom_dsp/x86/highbd_convolve_ssse3.c',
-    '/media/libaom/src/aom_dsp/x86/highbd_intrapred_asm_sse2.asm',
-    '/media/libaom/src/aom_dsp/x86/highbd_intrapred_sse2.c',
-    '/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_asm_sse2.asm',
-    '/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_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_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_avx2.c',
-    '/media/libaom/src/av1/common/x86/warp_plane_sse2.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/obu.c',
-  ],
-  'X64_EXPORTS': [
-    '/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': [
-    '/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/avg.c',
-    '/media/libaom/src/aom_dsp/binary_codes_reader.c',
-    '/media/libaom/src/aom_dsp/bitreader.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/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_sse2.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/avg_intrin_avx2.c',
-    '/media/libaom/src/aom_dsp/x86/avg_intrin_sse2.c',
-    '/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_sse2.c',
-    '/media/libaom/src/aom_dsp/x86/highbd_convolve_ssse3.c',
-    '/media/libaom/src/aom_dsp/x86/highbd_intrapred_asm_sse2.asm',
-    '/media/libaom/src/aom_dsp/x86/highbd_intrapred_sse2.c',
-    '/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_asm_sse2.asm',
-    '/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_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_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_avx2.c',
-    '/media/libaom/src/av1/common/x86/warp_plane_sse2.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/obu.c',
-  ],
-}