diff --git a/webrtc/build/common.gypi b/webrtc/build/common.gypi
index c5ba41fd22..18b33830dd 100644
--- a/webrtc/build/common.gypi
+++ b/webrtc/build/common.gypi
@@ -155,9 +155,7 @@
       ['target_arch=="arm" or target_arch=="armv7"', {
         'prefer_fixed_point%': 1,
       }],
-      # TODO(ajm): Workaround until openmax_dl has non-Android ARM support.
-      # See: crbug.com/415393
-      ['OS!="ios" and (target_arch!="arm" or OS=="android")', {
+      ['OS!="ios" and (target_arch!="arm" or arm_version>=7)', {
         'rtc_use_openmax_dl%': 1,
       }, {
         'rtc_use_openmax_dl%': 0,
diff --git a/webrtc/build/webrtc.gni b/webrtc/build/webrtc.gni
index e0f69249b6..0f10c0c390 100644
--- a/webrtc/build/webrtc.gni
+++ b/webrtc/build/webrtc.gni
@@ -103,9 +103,7 @@ declare_args() {
     rtc_prefer_fixed_point = true
   }
 
-  # TODO(ajm): Workaround until openmax_dl has non-Android ARM support.
-  # See: crbug.com/415393
-  if (!is_ios && (cpu_arch != "arm" || is_android)) {
+  if (!is_ios && (cpu_arch != "arm" || arm_version >= 7)) {
     rtc_use_openmax_dl = true
   } else {
     rtc_use_openmax_dl = false