diff --git a/configure.in b/configure.in
index b49a29c5843..cae47407453 100644
--- a/configure.in
+++ b/configure.in
@@ -6962,7 +6962,7 @@ dnl our own linker.
 if test "$OS_TARGET" = Android; then
     WRAP_LDFLAGS="${WRAP_LDFLAGS} -L$_objdir/dist/lib -lmozglue"
     WRAP_LDFLAGS="${WRAP_LDFLAGS} -Wl,--wrap=PR_GetEnv,--wrap=PR_SetEnv"
-    if test -z "$gonkdir" -o "$ANDROID_VERSION" -le 18; then
+    if test "$MOZ_WIDGET_TOOLKIT" = android; then
         WRAP_LDFLAGS="${WRAP_LDFLAGS} -Wl,--wrap=getaddrinfo,--wrap=freeaddrinfo,--wrap=gai_strerror"
     fi
     if test -z "$gonkdir"; then
diff --git a/moz.build b/moz.build
index 14aeb53db26..8380145017f 100644
--- a/moz.build
+++ b/moz.build
@@ -25,9 +25,8 @@ if not CONFIG['LIBXUL_SDK']:
     add_tier_dir('base', ['mfbt'])
 
     if not CONFIG['JS_STANDALONE']:
-        if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android', 'gonk'):
-            if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk' and CONFIG['ANDROID_VERSION'] <= '18':
-                add_tier_dir('base', ['other-licenses/android'])
+        if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
+            add_tier_dir('base', ['other-licenses/android'])
 
         if CONFIG['MOZ_MEMORY']:
             add_tier_dir('base', ['memory'])