diff --git a/js/src/old-configure.in b/js/src/old-configure.in
index 00a120bd4a..f651cced5d 100644
--- a/js/src/old-configure.in
+++ b/js/src/old-configure.in
@@ -639,15 +639,6 @@ case "$target" in
     MOZ_FIX_LINK_PATHS="-Wl,-executable_path,${DIST}/bin"
     ;;
 
-*-android*|*-linuxandroid*)
-    AC_DEFINE(NO_PW_GECOS)
-    MOZ_GFX_OPTIMIZE_MOBILE=1
-    MOZ_OPTIMIZE_FLAGS="-O3"
-    if test -z "$CLANG_CC"; then
-       MOZ_OPTIMIZE_FLAGS="-freorder-blocks -fno-reorder-functions $MOZ_OPTIMIZE_FLAGS"
-    fi
-    ;;
-
 *-*linux*)
     if test "$GNU_CC" -o "$GNU_CXX"; then
         MOZ_PGO_OPTIMIZE_FLAGS="-O3"
@@ -1429,9 +1420,6 @@ if test "$ac_cv_thread_keyword" = yes; then
     mips*-*)
       :
       ;;
-    *-android*|*-linuxandroid*)
-      :
-      ;;
     *)
       AC_DEFINE(HAVE_THREAD_TLS_KEYWORD)
       ;;
diff --git a/old-configure.in b/old-configure.in
index 05a32674fa..5967e3ad42 100644
--- a/old-configure.in
+++ b/old-configure.in
@@ -849,19 +849,6 @@ case "$target" in
     MOZ_FIX_LINK_PATHS="-Wl,-executable_path,${DIST}/bin"
     ;;
 
-*-android*|*-linuxandroid*)
-    AC_DEFINE(NO_PW_GECOS)
-    if test "$COMPILE_ENVIRONMENT"; then
-        MOZ_LINKER=1
-    fi
-
-    MOZ_GFX_OPTIMIZE_MOBILE=1
-    MOZ_OPTIMIZE_FLAGS="-O2"
-    if test -z "$CLANG_CC"; then
-       MOZ_OPTIMIZE_FLAGS="-freorder-blocks -fno-reorder-functions $MOZ_OPTIMIZE_FLAGS"
-    fi
-    ;;
-
 *-*linux*)
     if test "$GNU_CC" -o "$GNU_CXX"; then
         MOZ_PGO_OPTIMIZE_FLAGS="-O3"
@@ -1851,9 +1838,6 @@ if test "$ac_cv_thread_keyword" = yes -a "$MOZ_LINKER" != 1; then
     mips*-*)
       :
       ;;
-    *-android*|*-linuxandroid*)
-      :
-      ;;
     *-openbsd*)
       :
       ;;
@@ -2168,30 +2152,6 @@ case "$target_os" in
         ;;
 esac
 
-case "${target}" in
-    *-android*|*-linuxandroid*)
-        MOZ_THEME_FASTSTRIPE=1
-        MOZ_RAW=1
-        ;;
-
-esac
-
-# Optional Firefox for Android partner distribution directory.
-MOZ_ARG_WITH_STRING(android-distribution-directory,
-[  --with-android-distribution-directory=dir
-                          Optional Firefox for Android partner distribution directory.],
-  MOZ_ANDROID_DISTRIBUTION_DIRECTORY=$withval)
-
-if test -n "$MOZ_ANDROID_DISTRIBUTION_DIRECTORY"; then
-  # A distribution directory must have an assets/distribution directory.
-  # See https://wiki.mozilla.org/Mobile/Distribution_Files.
-  if test ! -d "$MOZ_ANDROID_DISTRIBUTION_DIRECTORY/assets/distribution" ; then
-    AC_MSG_ERROR([--with-android-distribution-directory does not contain assets/distribution;
-                  (looked for ${MOZ_ANDROID_DISTRIBUTION_DIRECTORY}/assets/distribution).])
-  fi
-fi
-AC_SUBST(MOZ_ANDROID_DISTRIBUTION_DIRECTORY)
-
 dnl ========================================================
 dnl = Vendor override
 dnl ========================================================
@@ -2644,7 +2604,7 @@ dnl --enable-webrtc to override.  Can disable for everything in
 dnl the master list above.
 if test -n "$MOZ_WEBRTC"; then
     case "$target" in
-    *-linux*|*-mingw*|*-darwin*|*-android*|*-linuxandroid*|*-dragonfly*|*-freebsd*|*-netbsd*|*-openbsd*)
+    *-linux*|*-mingw*|*-darwin*|*-dragonfly*|*-freebsd*|*-netbsd*|*-openbsd*)
         dnl Leave enabled
         ;;
     *)