diff --git a/gen_asm_offsets_vp8.target.darwin-arm.mk b/gen_asm_offsets_vp8.target.darwin-arm.mk
index a6f33da..211be63 100644
--- a/gen_asm_offsets_vp8.target.darwin-arm.mk
+++ b/gen_asm_offsets_vp8.target.darwin-arm.mk
@@ -155,6 +155,8 @@
 	-Wno-non-virtual-dtor
 
 
+LOCAL_FDO_SUPPORT_Debug := false
+
 # Flags passed to both C and C++ files.
 MY_CFLAGS_Release := \
 	-fstack-protector \
@@ -255,7 +257,10 @@
 	-Wno-non-virtual-dtor
 
 
+LOCAL_FDO_SUPPORT_Release := false
+
 LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
+LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION))
 LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
 LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
 LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
diff --git a/gen_asm_offsets_vp8.target.darwin-arm64.mk b/gen_asm_offsets_vp8.target.darwin-arm64.mk
index 5f53b2d..3b3419d 100644
--- a/gen_asm_offsets_vp8.target.darwin-arm64.mk
+++ b/gen_asm_offsets_vp8.target.darwin-arm64.mk
@@ -143,6 +143,8 @@
 	-Wno-non-virtual-dtor
 
 
+LOCAL_FDO_SUPPORT_Debug := false
+
 # Flags passed to both C and C++ files.
 MY_CFLAGS_Release := \
 	--param=ssp-buffer-size=4 \
@@ -231,7 +233,10 @@
 	-Wno-non-virtual-dtor
 
 
+LOCAL_FDO_SUPPORT_Release := false
+
 LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
+LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION))
 LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
 LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
 LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
diff --git a/gen_asm_offsets_vp8.target.darwin-x86.mk b/gen_asm_offsets_vp8.target.darwin-x86.mk
index b2cce70..416fb40 100644
--- a/gen_asm_offsets_vp8.target.darwin-x86.mk
+++ b/gen_asm_offsets_vp8.target.darwin-x86.mk
@@ -149,6 +149,8 @@
 	-Wno-non-virtual-dtor
 
 
+LOCAL_FDO_SUPPORT_Debug := false
+
 # Flags passed to both C and C++ files.
 MY_CFLAGS_Release := \
 	--param=ssp-buffer-size=4 \
@@ -243,7 +245,10 @@
 	-Wno-non-virtual-dtor
 
 
+LOCAL_FDO_SUPPORT_Release := false
+
 LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
+LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION))
 LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
 LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
 LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
diff --git a/gen_asm_offsets_vp8.target.darwin-x86_64.mk b/gen_asm_offsets_vp8.target.darwin-x86_64.mk
index df2f08a..0388d86 100644
--- a/gen_asm_offsets_vp8.target.darwin-x86_64.mk
+++ b/gen_asm_offsets_vp8.target.darwin-x86_64.mk
@@ -148,6 +148,8 @@
 	-Wno-non-virtual-dtor
 
 
+LOCAL_FDO_SUPPORT_Debug := false
+
 # Flags passed to both C and C++ files.
 MY_CFLAGS_Release := \
 	-fstack-protector \
@@ -241,7 +243,10 @@
 	-Wno-non-virtual-dtor
 
 
+LOCAL_FDO_SUPPORT_Release := false
+
 LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
+LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION))
 LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
 LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
 LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
diff --git a/gen_asm_offsets_vp8.target.linux-arm.mk b/gen_asm_offsets_vp8.target.linux-arm.mk
index a6f33da..211be63 100644
--- a/gen_asm_offsets_vp8.target.linux-arm.mk
+++ b/gen_asm_offsets_vp8.target.linux-arm.mk
@@ -155,6 +155,8 @@
 	-Wno-non-virtual-dtor
 
 
+LOCAL_FDO_SUPPORT_Debug := false
+
 # Flags passed to both C and C++ files.
 MY_CFLAGS_Release := \
 	-fstack-protector \
@@ -255,7 +257,10 @@
 	-Wno-non-virtual-dtor
 
 
+LOCAL_FDO_SUPPORT_Release := false
+
 LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
+LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION))
 LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
 LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
 LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
diff --git a/gen_asm_offsets_vp8.target.linux-arm64.mk b/gen_asm_offsets_vp8.target.linux-arm64.mk
index 5f53b2d..3b3419d 100644
--- a/gen_asm_offsets_vp8.target.linux-arm64.mk
+++ b/gen_asm_offsets_vp8.target.linux-arm64.mk
@@ -143,6 +143,8 @@
 	-Wno-non-virtual-dtor
 
 
+LOCAL_FDO_SUPPORT_Debug := false
+
 # Flags passed to both C and C++ files.
 MY_CFLAGS_Release := \
 	--param=ssp-buffer-size=4 \
@@ -231,7 +233,10 @@
 	-Wno-non-virtual-dtor
 
 
+LOCAL_FDO_SUPPORT_Release := false
+
 LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
+LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION))
 LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
 LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
 LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
diff --git a/gen_asm_offsets_vp8.target.linux-x86.mk b/gen_asm_offsets_vp8.target.linux-x86.mk
index b2cce70..416fb40 100644
--- a/gen_asm_offsets_vp8.target.linux-x86.mk
+++ b/gen_asm_offsets_vp8.target.linux-x86.mk
@@ -149,6 +149,8 @@
 	-Wno-non-virtual-dtor
 
 
+LOCAL_FDO_SUPPORT_Debug := false
+
 # Flags passed to both C and C++ files.
 MY_CFLAGS_Release := \
 	--param=ssp-buffer-size=4 \
@@ -243,7 +245,10 @@
 	-Wno-non-virtual-dtor
 
 
+LOCAL_FDO_SUPPORT_Release := false
+
 LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
+LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION))
 LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
 LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
 LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
diff --git a/gen_asm_offsets_vp8.target.linux-x86_64.mk b/gen_asm_offsets_vp8.target.linux-x86_64.mk
index df2f08a..0388d86 100644
--- a/gen_asm_offsets_vp8.target.linux-x86_64.mk
+++ b/gen_asm_offsets_vp8.target.linux-x86_64.mk
@@ -148,6 +148,8 @@
 	-Wno-non-virtual-dtor
 
 
+LOCAL_FDO_SUPPORT_Debug := false
+
 # Flags passed to both C and C++ files.
 MY_CFLAGS_Release := \
 	-fstack-protector \
@@ -241,7 +243,10 @@
 	-Wno-non-virtual-dtor
 
 
+LOCAL_FDO_SUPPORT_Release := false
+
 LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
+LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION))
 LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
 LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
 LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
diff --git a/gen_asm_offsets_vpx_scale.target.darwin-arm.mk b/gen_asm_offsets_vpx_scale.target.darwin-arm.mk
index 4dee5fc..8f50695 100644
--- a/gen_asm_offsets_vpx_scale.target.darwin-arm.mk
+++ b/gen_asm_offsets_vpx_scale.target.darwin-arm.mk
@@ -155,6 +155,8 @@
 	-Wno-non-virtual-dtor
 
 
+LOCAL_FDO_SUPPORT_Debug := false
+
 # Flags passed to both C and C++ files.
 MY_CFLAGS_Release := \
 	-fstack-protector \
@@ -255,7 +257,10 @@
 	-Wno-non-virtual-dtor
 
 
+LOCAL_FDO_SUPPORT_Release := false
+
 LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
+LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION))
 LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
 LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
 LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
diff --git a/gen_asm_offsets_vpx_scale.target.linux-arm.mk b/gen_asm_offsets_vpx_scale.target.linux-arm.mk
index 4dee5fc..8f50695 100644
--- a/gen_asm_offsets_vpx_scale.target.linux-arm.mk
+++ b/gen_asm_offsets_vpx_scale.target.linux-arm.mk
@@ -155,6 +155,8 @@
 	-Wno-non-virtual-dtor
 
 
+LOCAL_FDO_SUPPORT_Debug := false
+
 # Flags passed to both C and C++ files.
 MY_CFLAGS_Release := \
 	-fstack-protector \
@@ -255,7 +257,10 @@
 	-Wno-non-virtual-dtor
 
 
+LOCAL_FDO_SUPPORT_Release := false
+
 LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
+LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION))
 LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
 LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
 LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
diff --git a/libvpx.target.darwin-arm.mk b/libvpx.target.darwin-arm.mk
index ad9c3d9..b6a5772 100644
--- a/libvpx.target.darwin-arm.mk
+++ b/libvpx.target.darwin-arm.mk
@@ -1094,6 +1094,8 @@
 	-Wno-non-virtual-dtor
 
 
+LOCAL_FDO_SUPPORT_Debug := false
+
 # Flags passed to both C and C++ files.
 MY_CFLAGS_Release := \
 	-fstack-protector \
@@ -1199,7 +1201,10 @@
 	-Wno-non-virtual-dtor
 
 
+LOCAL_FDO_SUPPORT_Release := false
+
 LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
+LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION))
 LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
 LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
 LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
diff --git a/libvpx.target.darwin-arm64.mk b/libvpx.target.darwin-arm64.mk
index 16a5ab0..a2c3f65 100644
--- a/libvpx.target.darwin-arm64.mk
+++ b/libvpx.target.darwin-arm64.mk
@@ -281,6 +281,8 @@
 	-Wno-non-virtual-dtor
 
 
+LOCAL_FDO_SUPPORT_Debug := false
+
 # Flags passed to both C and C++ files.
 MY_CFLAGS_Release := \
 	--param=ssp-buffer-size=4 \
@@ -376,7 +378,10 @@
 	-Wno-non-virtual-dtor
 
 
+LOCAL_FDO_SUPPORT_Release := false
+
 LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
+LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION))
 LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
 LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
 LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
diff --git a/libvpx.target.darwin-mips.mk b/libvpx.target.darwin-mips.mk
index cc9b3ce..783bf1d 100644
--- a/libvpx.target.darwin-mips.mk
+++ b/libvpx.target.darwin-mips.mk
@@ -268,6 +268,8 @@
 	-Wno-non-virtual-dtor
 
 
+LOCAL_FDO_SUPPORT_Debug := false
+
 # Flags passed to both C and C++ files.
 MY_CFLAGS_Release := \
 	-fstack-protector \
@@ -369,7 +371,10 @@
 	-Wno-non-virtual-dtor
 
 
+LOCAL_FDO_SUPPORT_Release := false
+
 LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
+LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION))
 LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
 LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
 LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
diff --git a/libvpx.target.darwin-x86.mk b/libvpx.target.darwin-x86.mk
index 78c15c0..dcbd711 100644
--- a/libvpx.target.darwin-x86.mk
+++ b/libvpx.target.darwin-x86.mk
@@ -880,6 +880,8 @@
 	-Wno-non-virtual-dtor
 
 
+LOCAL_FDO_SUPPORT_Debug := false
+
 # Flags passed to both C and C++ files.
 MY_CFLAGS_Release := \
 	--param=ssp-buffer-size=4 \
@@ -981,7 +983,10 @@
 	-Wno-non-virtual-dtor
 
 
+LOCAL_FDO_SUPPORT_Release := false
+
 LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
+LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION))
 LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
 LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
 LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
diff --git a/libvpx.target.darwin-x86_64.mk b/libvpx.target.darwin-x86_64.mk
index 58ca0b1..4970939 100644
--- a/libvpx.target.darwin-x86_64.mk
+++ b/libvpx.target.darwin-x86_64.mk
@@ -945,6 +945,8 @@
 	-Wno-non-virtual-dtor
 
 
+LOCAL_FDO_SUPPORT_Debug := false
+
 # Flags passed to both C and C++ files.
 MY_CFLAGS_Release := \
 	-fstack-protector \
@@ -1045,7 +1047,10 @@
 	-Wno-non-virtual-dtor
 
 
+LOCAL_FDO_SUPPORT_Release := false
+
 LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
+LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION))
 LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
 LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
 LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
diff --git a/libvpx.target.linux-arm.mk b/libvpx.target.linux-arm.mk
index ad9c3d9..b6a5772 100644
--- a/libvpx.target.linux-arm.mk
+++ b/libvpx.target.linux-arm.mk
@@ -1094,6 +1094,8 @@
 	-Wno-non-virtual-dtor
 
 
+LOCAL_FDO_SUPPORT_Debug := false
+
 # Flags passed to both C and C++ files.
 MY_CFLAGS_Release := \
 	-fstack-protector \
@@ -1199,7 +1201,10 @@
 	-Wno-non-virtual-dtor
 
 
+LOCAL_FDO_SUPPORT_Release := false
+
 LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
+LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION))
 LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
 LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
 LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
diff --git a/libvpx.target.linux-arm64.mk b/libvpx.target.linux-arm64.mk
index 16a5ab0..a2c3f65 100644
--- a/libvpx.target.linux-arm64.mk
+++ b/libvpx.target.linux-arm64.mk
@@ -281,6 +281,8 @@
 	-Wno-non-virtual-dtor
 
 
+LOCAL_FDO_SUPPORT_Debug := false
+
 # Flags passed to both C and C++ files.
 MY_CFLAGS_Release := \
 	--param=ssp-buffer-size=4 \
@@ -376,7 +378,10 @@
 	-Wno-non-virtual-dtor
 
 
+LOCAL_FDO_SUPPORT_Release := false
+
 LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
+LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION))
 LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
 LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
 LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
diff --git a/libvpx.target.linux-mips.mk b/libvpx.target.linux-mips.mk
index cc9b3ce..783bf1d 100644
--- a/libvpx.target.linux-mips.mk
+++ b/libvpx.target.linux-mips.mk
@@ -268,6 +268,8 @@
 	-Wno-non-virtual-dtor
 
 
+LOCAL_FDO_SUPPORT_Debug := false
+
 # Flags passed to both C and C++ files.
 MY_CFLAGS_Release := \
 	-fstack-protector \
@@ -369,7 +371,10 @@
 	-Wno-non-virtual-dtor
 
 
+LOCAL_FDO_SUPPORT_Release := false
+
 LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
+LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION))
 LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
 LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
 LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
diff --git a/libvpx.target.linux-x86.mk b/libvpx.target.linux-x86.mk
index 78c15c0..dcbd711 100644
--- a/libvpx.target.linux-x86.mk
+++ b/libvpx.target.linux-x86.mk
@@ -880,6 +880,8 @@
 	-Wno-non-virtual-dtor
 
 
+LOCAL_FDO_SUPPORT_Debug := false
+
 # Flags passed to both C and C++ files.
 MY_CFLAGS_Release := \
 	--param=ssp-buffer-size=4 \
@@ -981,7 +983,10 @@
 	-Wno-non-virtual-dtor
 
 
+LOCAL_FDO_SUPPORT_Release := false
+
 LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
+LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION))
 LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
 LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
 LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
diff --git a/libvpx.target.linux-x86_64.mk b/libvpx.target.linux-x86_64.mk
index 58ca0b1..4970939 100644
--- a/libvpx.target.linux-x86_64.mk
+++ b/libvpx.target.linux-x86_64.mk
@@ -945,6 +945,8 @@
 	-Wno-non-virtual-dtor
 
 
+LOCAL_FDO_SUPPORT_Debug := false
+
 # Flags passed to both C and C++ files.
 MY_CFLAGS_Release := \
 	-fstack-protector \
@@ -1045,7 +1047,10 @@
 	-Wno-non-virtual-dtor
 
 
+LOCAL_FDO_SUPPORT_Release := false
+
 LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
+LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION))
 LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
 LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
 LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
diff --git a/libvpx_asm_offsets_vp8.target.darwin-arm.mk b/libvpx_asm_offsets_vp8.target.darwin-arm.mk
index 29acfc5..53a90fb 100644
--- a/libvpx_asm_offsets_vp8.target.darwin-arm.mk
+++ b/libvpx_asm_offsets_vp8.target.darwin-arm.mk
@@ -129,6 +129,8 @@
 	-Wno-non-virtual-dtor
 
 
+LOCAL_FDO_SUPPORT_Debug := false
+
 # Flags passed to both C and C++ files.
 MY_CFLAGS_Release := \
 	-fstack-protector \
@@ -232,7 +234,10 @@
 	-Wno-non-virtual-dtor
 
 
+LOCAL_FDO_SUPPORT_Release := false
+
 LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
+LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION))
 LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
 LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
 LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
diff --git a/libvpx_asm_offsets_vp8.target.darwin-arm64.mk b/libvpx_asm_offsets_vp8.target.darwin-arm64.mk
index b522f7b..eda6466 100644
--- a/libvpx_asm_offsets_vp8.target.darwin-arm64.mk
+++ b/libvpx_asm_offsets_vp8.target.darwin-arm64.mk
@@ -117,6 +117,8 @@
 	-Wno-non-virtual-dtor
 
 
+LOCAL_FDO_SUPPORT_Debug := false
+
 # Flags passed to both C and C++ files.
 MY_CFLAGS_Release := \
 	--param=ssp-buffer-size=4 \
@@ -208,7 +210,10 @@
 	-Wno-non-virtual-dtor
 
 
+LOCAL_FDO_SUPPORT_Release := false
+
 LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
+LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION))
 LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
 LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
 LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
diff --git a/libvpx_asm_offsets_vp8.target.darwin-x86.mk b/libvpx_asm_offsets_vp8.target.darwin-x86.mk
index 1fb293e..651f11e 100644
--- a/libvpx_asm_offsets_vp8.target.darwin-x86.mk
+++ b/libvpx_asm_offsets_vp8.target.darwin-x86.mk
@@ -123,6 +123,8 @@
 	-Wno-non-virtual-dtor
 
 
+LOCAL_FDO_SUPPORT_Debug := false
+
 # Flags passed to both C and C++ files.
 MY_CFLAGS_Release := \
 	--param=ssp-buffer-size=4 \
@@ -220,7 +222,10 @@
 	-Wno-non-virtual-dtor
 
 
+LOCAL_FDO_SUPPORT_Release := false
+
 LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
+LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION))
 LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
 LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
 LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
diff --git a/libvpx_asm_offsets_vp8.target.darwin-x86_64.mk b/libvpx_asm_offsets_vp8.target.darwin-x86_64.mk
index 140f2a9..f78c3dd 100644
--- a/libvpx_asm_offsets_vp8.target.darwin-x86_64.mk
+++ b/libvpx_asm_offsets_vp8.target.darwin-x86_64.mk
@@ -122,6 +122,8 @@
 	-Wno-non-virtual-dtor
 
 
+LOCAL_FDO_SUPPORT_Debug := false
+
 # Flags passed to both C and C++ files.
 MY_CFLAGS_Release := \
 	-fstack-protector \
@@ -218,7 +220,10 @@
 	-Wno-non-virtual-dtor
 
 
+LOCAL_FDO_SUPPORT_Release := false
+
 LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
+LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION))
 LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
 LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
 LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
diff --git a/libvpx_asm_offsets_vp8.target.linux-arm.mk b/libvpx_asm_offsets_vp8.target.linux-arm.mk
index 29acfc5..53a90fb 100644
--- a/libvpx_asm_offsets_vp8.target.linux-arm.mk
+++ b/libvpx_asm_offsets_vp8.target.linux-arm.mk
@@ -129,6 +129,8 @@
 	-Wno-non-virtual-dtor
 
 
+LOCAL_FDO_SUPPORT_Debug := false
+
 # Flags passed to both C and C++ files.
 MY_CFLAGS_Release := \
 	-fstack-protector \
@@ -232,7 +234,10 @@
 	-Wno-non-virtual-dtor
 
 
+LOCAL_FDO_SUPPORT_Release := false
+
 LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
+LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION))
 LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
 LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
 LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
diff --git a/libvpx_asm_offsets_vp8.target.linux-arm64.mk b/libvpx_asm_offsets_vp8.target.linux-arm64.mk
index b522f7b..eda6466 100644
--- a/libvpx_asm_offsets_vp8.target.linux-arm64.mk
+++ b/libvpx_asm_offsets_vp8.target.linux-arm64.mk
@@ -117,6 +117,8 @@
 	-Wno-non-virtual-dtor
 
 
+LOCAL_FDO_SUPPORT_Debug := false
+
 # Flags passed to both C and C++ files.
 MY_CFLAGS_Release := \
 	--param=ssp-buffer-size=4 \
@@ -208,7 +210,10 @@
 	-Wno-non-virtual-dtor
 
 
+LOCAL_FDO_SUPPORT_Release := false
+
 LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
+LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION))
 LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
 LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
 LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
diff --git a/libvpx_asm_offsets_vp8.target.linux-x86.mk b/libvpx_asm_offsets_vp8.target.linux-x86.mk
index 1fb293e..651f11e 100644
--- a/libvpx_asm_offsets_vp8.target.linux-x86.mk
+++ b/libvpx_asm_offsets_vp8.target.linux-x86.mk
@@ -123,6 +123,8 @@
 	-Wno-non-virtual-dtor
 
 
+LOCAL_FDO_SUPPORT_Debug := false
+
 # Flags passed to both C and C++ files.
 MY_CFLAGS_Release := \
 	--param=ssp-buffer-size=4 \
@@ -220,7 +222,10 @@
 	-Wno-non-virtual-dtor
 
 
+LOCAL_FDO_SUPPORT_Release := false
+
 LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
+LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION))
 LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
 LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
 LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
diff --git a/libvpx_asm_offsets_vp8.target.linux-x86_64.mk b/libvpx_asm_offsets_vp8.target.linux-x86_64.mk
index 140f2a9..f78c3dd 100644
--- a/libvpx_asm_offsets_vp8.target.linux-x86_64.mk
+++ b/libvpx_asm_offsets_vp8.target.linux-x86_64.mk
@@ -122,6 +122,8 @@
 	-Wno-non-virtual-dtor
 
 
+LOCAL_FDO_SUPPORT_Debug := false
+
 # Flags passed to both C and C++ files.
 MY_CFLAGS_Release := \
 	-fstack-protector \
@@ -218,7 +220,10 @@
 	-Wno-non-virtual-dtor
 
 
+LOCAL_FDO_SUPPORT_Release := false
+
 LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
+LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION))
 LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
 LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
 LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
diff --git a/libvpx_asm_offsets_vpx_scale.target.darwin-arm.mk b/libvpx_asm_offsets_vpx_scale.target.darwin-arm.mk
index 0eeed33..f1e40dc 100644
--- a/libvpx_asm_offsets_vpx_scale.target.darwin-arm.mk
+++ b/libvpx_asm_offsets_vpx_scale.target.darwin-arm.mk
@@ -129,6 +129,8 @@
 	-Wno-non-virtual-dtor
 
 
+LOCAL_FDO_SUPPORT_Debug := false
+
 # Flags passed to both C and C++ files.
 MY_CFLAGS_Release := \
 	-fstack-protector \
@@ -232,7 +234,10 @@
 	-Wno-non-virtual-dtor
 
 
+LOCAL_FDO_SUPPORT_Release := false
+
 LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
+LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION))
 LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
 LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
 LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
diff --git a/libvpx_asm_offsets_vpx_scale.target.linux-arm.mk b/libvpx_asm_offsets_vpx_scale.target.linux-arm.mk
index 0eeed33..f1e40dc 100644
--- a/libvpx_asm_offsets_vpx_scale.target.linux-arm.mk
+++ b/libvpx_asm_offsets_vpx_scale.target.linux-arm.mk
@@ -129,6 +129,8 @@
 	-Wno-non-virtual-dtor
 
 
+LOCAL_FDO_SUPPORT_Debug := false
+
 # Flags passed to both C and C++ files.
 MY_CFLAGS_Release := \
 	-fstack-protector \
@@ -232,7 +234,10 @@
 	-Wno-non-virtual-dtor
 
 
+LOCAL_FDO_SUPPORT_Release := false
+
 LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
+LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION))
 LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
 LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
 LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
diff --git a/libvpx_intrinsics_mmx.target.darwin-x86.mk b/libvpx_intrinsics_mmx.target.darwin-x86.mk
index 301f4e3..0c6ba28 100644
--- a/libvpx_intrinsics_mmx.target.darwin-x86.mk
+++ b/libvpx_intrinsics_mmx.target.darwin-x86.mk
@@ -126,6 +126,8 @@
 	-Wno-non-virtual-dtor
 
 
+LOCAL_FDO_SUPPORT_Debug := false
+
 # Flags passed to both C and C++ files.
 MY_CFLAGS_Release := \
 	--param=ssp-buffer-size=4 \
@@ -223,7 +225,10 @@
 	-Wno-non-virtual-dtor
 
 
+LOCAL_FDO_SUPPORT_Release := false
+
 LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
+LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION))
 LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
 LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
 LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
diff --git a/libvpx_intrinsics_mmx.target.darwin-x86_64.mk b/libvpx_intrinsics_mmx.target.darwin-x86_64.mk
index eca9375..c6135e3 100644
--- a/libvpx_intrinsics_mmx.target.darwin-x86_64.mk
+++ b/libvpx_intrinsics_mmx.target.darwin-x86_64.mk
@@ -125,6 +125,8 @@
 	-Wno-non-virtual-dtor
 
 
+LOCAL_FDO_SUPPORT_Debug := false
+
 # Flags passed to both C and C++ files.
 MY_CFLAGS_Release := \
 	-fstack-protector \
@@ -221,7 +223,10 @@
 	-Wno-non-virtual-dtor
 
 
+LOCAL_FDO_SUPPORT_Release := false
+
 LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
+LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION))
 LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
 LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
 LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
diff --git a/libvpx_intrinsics_mmx.target.linux-x86.mk b/libvpx_intrinsics_mmx.target.linux-x86.mk
index 301f4e3..0c6ba28 100644
--- a/libvpx_intrinsics_mmx.target.linux-x86.mk
+++ b/libvpx_intrinsics_mmx.target.linux-x86.mk
@@ -126,6 +126,8 @@
 	-Wno-non-virtual-dtor
 
 
+LOCAL_FDO_SUPPORT_Debug := false
+
 # Flags passed to both C and C++ files.
 MY_CFLAGS_Release := \
 	--param=ssp-buffer-size=4 \
@@ -223,7 +225,10 @@
 	-Wno-non-virtual-dtor
 
 
+LOCAL_FDO_SUPPORT_Release := false
+
 LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
+LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION))
 LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
 LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
 LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
diff --git a/libvpx_intrinsics_mmx.target.linux-x86_64.mk b/libvpx_intrinsics_mmx.target.linux-x86_64.mk
index eca9375..c6135e3 100644
--- a/libvpx_intrinsics_mmx.target.linux-x86_64.mk
+++ b/libvpx_intrinsics_mmx.target.linux-x86_64.mk
@@ -125,6 +125,8 @@
 	-Wno-non-virtual-dtor
 
 
+LOCAL_FDO_SUPPORT_Debug := false
+
 # Flags passed to both C and C++ files.
 MY_CFLAGS_Release := \
 	-fstack-protector \
@@ -221,7 +223,10 @@
 	-Wno-non-virtual-dtor
 
 
+LOCAL_FDO_SUPPORT_Release := false
+
 LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
+LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION))
 LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
 LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
 LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
diff --git a/libvpx_intrinsics_neon.target.darwin-arm.mk b/libvpx_intrinsics_neon.target.darwin-arm.mk
index 39373e9..2fa6cdd 100644
--- a/libvpx_intrinsics_neon.target.darwin-arm.mk
+++ b/libvpx_intrinsics_neon.target.darwin-arm.mk
@@ -145,6 +145,8 @@
 	-Wno-non-virtual-dtor
 
 
+LOCAL_FDO_SUPPORT_Debug := false
+
 # Flags passed to both C and C++ files.
 MY_CFLAGS_Release := \
 	-fstack-protector \
@@ -248,7 +250,10 @@
 	-Wno-non-virtual-dtor
 
 
+LOCAL_FDO_SUPPORT_Release := false
+
 LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
+LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION))
 LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
 LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
 LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
diff --git a/libvpx_intrinsics_neon.target.linux-arm.mk b/libvpx_intrinsics_neon.target.linux-arm.mk
index 39373e9..2fa6cdd 100644
--- a/libvpx_intrinsics_neon.target.linux-arm.mk
+++ b/libvpx_intrinsics_neon.target.linux-arm.mk
@@ -145,6 +145,8 @@
 	-Wno-non-virtual-dtor
 
 
+LOCAL_FDO_SUPPORT_Debug := false
+
 # Flags passed to both C and C++ files.
 MY_CFLAGS_Release := \
 	-fstack-protector \
@@ -248,7 +250,10 @@
 	-Wno-non-virtual-dtor
 
 
+LOCAL_FDO_SUPPORT_Release := false
+
 LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
+LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION))
 LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
 LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
 LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
diff --git a/libvpx_intrinsics_sse2.target.darwin-x86.mk b/libvpx_intrinsics_sse2.target.darwin-x86.mk
index f6e2c5b..5208a77 100644
--- a/libvpx_intrinsics_sse2.target.darwin-x86.mk
+++ b/libvpx_intrinsics_sse2.target.darwin-x86.mk
@@ -133,6 +133,8 @@
 	-Wno-non-virtual-dtor
 
 
+LOCAL_FDO_SUPPORT_Debug := false
+
 # Flags passed to both C and C++ files.
 MY_CFLAGS_Release := \
 	--param=ssp-buffer-size=4 \
@@ -230,7 +232,10 @@
 	-Wno-non-virtual-dtor
 
 
+LOCAL_FDO_SUPPORT_Release := false
+
 LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
+LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION))
 LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
 LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
 LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
diff --git a/libvpx_intrinsics_sse2.target.darwin-x86_64.mk b/libvpx_intrinsics_sse2.target.darwin-x86_64.mk
index 6189d6c..67e5e4f 100644
--- a/libvpx_intrinsics_sse2.target.darwin-x86_64.mk
+++ b/libvpx_intrinsics_sse2.target.darwin-x86_64.mk
@@ -132,6 +132,8 @@
 	-Wno-non-virtual-dtor
 
 
+LOCAL_FDO_SUPPORT_Debug := false
+
 # Flags passed to both C and C++ files.
 MY_CFLAGS_Release := \
 	-fstack-protector \
@@ -228,7 +230,10 @@
 	-Wno-non-virtual-dtor
 
 
+LOCAL_FDO_SUPPORT_Release := false
+
 LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
+LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION))
 LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
 LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
 LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
diff --git a/libvpx_intrinsics_sse2.target.linux-x86.mk b/libvpx_intrinsics_sse2.target.linux-x86.mk
index f6e2c5b..5208a77 100644
--- a/libvpx_intrinsics_sse2.target.linux-x86.mk
+++ b/libvpx_intrinsics_sse2.target.linux-x86.mk
@@ -133,6 +133,8 @@
 	-Wno-non-virtual-dtor
 
 
+LOCAL_FDO_SUPPORT_Debug := false
+
 # Flags passed to both C and C++ files.
 MY_CFLAGS_Release := \
 	--param=ssp-buffer-size=4 \
@@ -230,7 +232,10 @@
 	-Wno-non-virtual-dtor
 
 
+LOCAL_FDO_SUPPORT_Release := false
+
 LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
+LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION))
 LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
 LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
 LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
diff --git a/libvpx_intrinsics_sse2.target.linux-x86_64.mk b/libvpx_intrinsics_sse2.target.linux-x86_64.mk
index 6189d6c..67e5e4f 100644
--- a/libvpx_intrinsics_sse2.target.linux-x86_64.mk
+++ b/libvpx_intrinsics_sse2.target.linux-x86_64.mk
@@ -132,6 +132,8 @@
 	-Wno-non-virtual-dtor
 
 
+LOCAL_FDO_SUPPORT_Debug := false
+
 # Flags passed to both C and C++ files.
 MY_CFLAGS_Release := \
 	-fstack-protector \
@@ -228,7 +230,10 @@
 	-Wno-non-virtual-dtor
 
 
+LOCAL_FDO_SUPPORT_Release := false
+
 LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
+LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION))
 LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
 LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
 LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
diff --git a/libvpx_intrinsics_ssse3.target.darwin-x86.mk b/libvpx_intrinsics_ssse3.target.darwin-x86.mk
index 9ed8efb..f04de43 100644
--- a/libvpx_intrinsics_ssse3.target.darwin-x86.mk
+++ b/libvpx_intrinsics_ssse3.target.darwin-x86.mk
@@ -125,6 +125,8 @@
 	-Wno-non-virtual-dtor
 
 
+LOCAL_FDO_SUPPORT_Debug := false
+
 # Flags passed to both C and C++ files.
 MY_CFLAGS_Release := \
 	--param=ssp-buffer-size=4 \
@@ -222,7 +224,10 @@
 	-Wno-non-virtual-dtor
 
 
+LOCAL_FDO_SUPPORT_Release := false
+
 LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
+LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION))
 LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
 LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
 LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
diff --git a/libvpx_intrinsics_ssse3.target.darwin-x86_64.mk b/libvpx_intrinsics_ssse3.target.darwin-x86_64.mk
index cc60a47..fe22854 100644
--- a/libvpx_intrinsics_ssse3.target.darwin-x86_64.mk
+++ b/libvpx_intrinsics_ssse3.target.darwin-x86_64.mk
@@ -124,6 +124,8 @@
 	-Wno-non-virtual-dtor
 
 
+LOCAL_FDO_SUPPORT_Debug := false
+
 # Flags passed to both C and C++ files.
 MY_CFLAGS_Release := \
 	-fstack-protector \
@@ -220,7 +222,10 @@
 	-Wno-non-virtual-dtor
 
 
+LOCAL_FDO_SUPPORT_Release := false
+
 LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
+LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION))
 LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
 LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
 LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
diff --git a/libvpx_intrinsics_ssse3.target.linux-x86.mk b/libvpx_intrinsics_ssse3.target.linux-x86.mk
index 9ed8efb..f04de43 100644
--- a/libvpx_intrinsics_ssse3.target.linux-x86.mk
+++ b/libvpx_intrinsics_ssse3.target.linux-x86.mk
@@ -125,6 +125,8 @@
 	-Wno-non-virtual-dtor
 
 
+LOCAL_FDO_SUPPORT_Debug := false
+
 # Flags passed to both C and C++ files.
 MY_CFLAGS_Release := \
 	--param=ssp-buffer-size=4 \
@@ -222,7 +224,10 @@
 	-Wno-non-virtual-dtor
 
 
+LOCAL_FDO_SUPPORT_Release := false
+
 LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
+LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION))
 LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
 LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
 LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
diff --git a/libvpx_intrinsics_ssse3.target.linux-x86_64.mk b/libvpx_intrinsics_ssse3.target.linux-x86_64.mk
index cc60a47..fe22854 100644
--- a/libvpx_intrinsics_ssse3.target.linux-x86_64.mk
+++ b/libvpx_intrinsics_ssse3.target.linux-x86_64.mk
@@ -124,6 +124,8 @@
 	-Wno-non-virtual-dtor
 
 
+LOCAL_FDO_SUPPORT_Debug := false
+
 # Flags passed to both C and C++ files.
 MY_CFLAGS_Release := \
 	-fstack-protector \
@@ -220,7 +222,10 @@
 	-Wno-non-virtual-dtor
 
 
+LOCAL_FDO_SUPPORT_Release := false
+
 LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
+LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION))
 LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
 LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
 LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
diff --git a/libvpx_obj_int_extract.host.darwin-arm.mk b/libvpx_obj_int_extract.host.darwin-arm.mk
index bb39c4c..ca07ec8 100644
--- a/libvpx_obj_int_extract.host.darwin-arm.mk
+++ b/libvpx_obj_int_extract.host.darwin-arm.mk
@@ -97,6 +97,8 @@
 	-Wno-deprecated
 
 
+LOCAL_FDO_SUPPORT_Debug := false
+
 # Flags passed to both C and C++ files.
 MY_CFLAGS_Release := \
 	-fstack-protector \
@@ -166,7 +168,10 @@
 	-Wno-deprecated
 
 
+LOCAL_FDO_SUPPORT_Release := false
+
 LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
+LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION))
 # Undefine ANDROID for host modules
 LOCAL_CFLAGS += -UANDROID
 LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
diff --git a/libvpx_obj_int_extract.host.darwin-arm64.mk b/libvpx_obj_int_extract.host.darwin-arm64.mk
index 934c8ae..df8c65c 100644
--- a/libvpx_obj_int_extract.host.darwin-arm64.mk
+++ b/libvpx_obj_int_extract.host.darwin-arm64.mk
@@ -96,6 +96,8 @@
 	-Wno-deprecated
 
 
+LOCAL_FDO_SUPPORT_Debug := false
+
 # Flags passed to both C and C++ files.
 MY_CFLAGS_Release := \
 	-fstack-protector \
@@ -164,7 +166,10 @@
 	-Wno-deprecated
 
 
+LOCAL_FDO_SUPPORT_Release := false
+
 LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
+LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION))
 # Undefine ANDROID for host modules
 LOCAL_CFLAGS += -UANDROID
 LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
diff --git a/libvpx_obj_int_extract.host.darwin-x86.mk b/libvpx_obj_int_extract.host.darwin-x86.mk
index 28131e8..8869fc1 100644
--- a/libvpx_obj_int_extract.host.darwin-x86.mk
+++ b/libvpx_obj_int_extract.host.darwin-x86.mk
@@ -97,6 +97,8 @@
 	-Wno-deprecated
 
 
+LOCAL_FDO_SUPPORT_Debug := false
+
 # Flags passed to both C and C++ files.
 MY_CFLAGS_Release := \
 	-fstack-protector \
@@ -166,7 +168,10 @@
 	-Wno-deprecated
 
 
+LOCAL_FDO_SUPPORT_Release := false
+
 LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
+LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION))
 # Undefine ANDROID for host modules
 LOCAL_CFLAGS += -UANDROID
 LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
diff --git a/libvpx_obj_int_extract.host.darwin-x86_64.mk b/libvpx_obj_int_extract.host.darwin-x86_64.mk
index 8248742..908cd25 100644
--- a/libvpx_obj_int_extract.host.darwin-x86_64.mk
+++ b/libvpx_obj_int_extract.host.darwin-x86_64.mk
@@ -97,6 +97,8 @@
 	-Wno-deprecated
 
 
+LOCAL_FDO_SUPPORT_Debug := false
+
 # Flags passed to both C and C++ files.
 MY_CFLAGS_Release := \
 	-fstack-protector \
@@ -166,7 +168,10 @@
 	-Wno-deprecated
 
 
+LOCAL_FDO_SUPPORT_Release := false
+
 LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
+LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION))
 # Undefine ANDROID for host modules
 LOCAL_CFLAGS += -UANDROID
 LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
diff --git a/libvpx_obj_int_extract.host.linux-arm.mk b/libvpx_obj_int_extract.host.linux-arm.mk
index a6f84ba..a36c073 100644
--- a/libvpx_obj_int_extract.host.linux-arm.mk
+++ b/libvpx_obj_int_extract.host.linux-arm.mk
@@ -98,6 +98,8 @@
 	-Wno-deprecated
 
 
+LOCAL_FDO_SUPPORT_Debug := false
+
 # Flags passed to both C and C++ files.
 MY_CFLAGS_Release := \
 	-fstack-protector \
@@ -168,7 +170,10 @@
 	-Wno-deprecated
 
 
+LOCAL_FDO_SUPPORT_Release := false
+
 LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
+LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION))
 # Undefine ANDROID for host modules
 LOCAL_CFLAGS += -UANDROID
 LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
diff --git a/libvpx_obj_int_extract.host.linux-arm64.mk b/libvpx_obj_int_extract.host.linux-arm64.mk
index e42b4e0..7431609 100644
--- a/libvpx_obj_int_extract.host.linux-arm64.mk
+++ b/libvpx_obj_int_extract.host.linux-arm64.mk
@@ -97,6 +97,8 @@
 	-Wno-deprecated
 
 
+LOCAL_FDO_SUPPORT_Debug := false
+
 # Flags passed to both C and C++ files.
 MY_CFLAGS_Release := \
 	-fstack-protector \
@@ -166,7 +168,10 @@
 	-Wno-deprecated
 
 
+LOCAL_FDO_SUPPORT_Release := false
+
 LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
+LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION))
 # Undefine ANDROID for host modules
 LOCAL_CFLAGS += -UANDROID
 LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
diff --git a/libvpx_obj_int_extract.host.linux-x86.mk b/libvpx_obj_int_extract.host.linux-x86.mk
index 9f676f5..1db8242 100644
--- a/libvpx_obj_int_extract.host.linux-x86.mk
+++ b/libvpx_obj_int_extract.host.linux-x86.mk
@@ -98,6 +98,8 @@
 	-Wno-deprecated
 
 
+LOCAL_FDO_SUPPORT_Debug := false
+
 # Flags passed to both C and C++ files.
 MY_CFLAGS_Release := \
 	-fstack-protector \
@@ -168,7 +170,10 @@
 	-Wno-deprecated
 
 
+LOCAL_FDO_SUPPORT_Release := false
+
 LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
+LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION))
 # Undefine ANDROID for host modules
 LOCAL_CFLAGS += -UANDROID
 LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
diff --git a/libvpx_obj_int_extract.host.linux-x86_64.mk b/libvpx_obj_int_extract.host.linux-x86_64.mk
index b377dd0..044c48a 100644
--- a/libvpx_obj_int_extract.host.linux-x86_64.mk
+++ b/libvpx_obj_int_extract.host.linux-x86_64.mk
@@ -98,6 +98,8 @@
 	-Wno-deprecated
 
 
+LOCAL_FDO_SUPPORT_Debug := false
+
 # Flags passed to both C and C++ files.
 MY_CFLAGS_Release := \
 	-fstack-protector \
@@ -168,7 +170,10 @@
 	-Wno-deprecated
 
 
+LOCAL_FDO_SUPPORT_Release := false
+
 LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
+LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION))
 # Undefine ANDROID for host modules
 LOCAL_CFLAGS += -UANDROID
 LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))