--- a/build/moz.configure/old.configure
+++ b/build/moz.configure/old.configure
@@ -153,17 +153,16 @@ def old_configure_options(*options):
                    *options)
 
 
 @old_configure_options(
     '--cache-file',
     '--enable-accessibility',
     '--enable-address-sanitizer',
     '--enable-alsa',
-    '--enable-android-apz',
     '--enable-android-omx',
     '--enable-android-resource-constrained',
     '--enable-approximate-location',
     '--enable-b2g-bt',
     '--enable-b2g-camera',
     '--enable-b2g-ril',
     '--enable-bundled-fonts',
     '--enable-clang-plugin',

--- a/mobile/android/confvars.sh
+++ b/mobile/android/confvars.sh
@@ -69,13 +69,10 @@ fi
 MOZ_WEBGL_CONFORMANT=1
 
 # Build and package the install bouncer APK by default.
 MOZ_ANDROID_PACKAGE_INSTALL_BOUNCER=1
 
 # Use the low-memory GC tuning.
 export JS_GC_SMALL_CHUNK_SIZE=1
 
-# Enable C++ APZ.
-MOZ_ANDROID_APZ=1
-
 # Enable checking that add-ons are signed by the trusted root
 MOZ_ADDON_SIGNING=1

--- a/mobile/android/moz.configure
+++ b/mobile/android/moz.configure
@@ -39,16 +39,22 @@ env_flag('MOZ_ANDROID_DOWNLOAD_CONTENT_S
 
 # Enable the Switchboard A/B framework code.
 # Note: The framework is always included in the app. This flag controls
 # usage of the framework.
 env_flag('MOZ_SWITCHBOARD',
          help='Include Switchboard A/B framework on Android',
          default=True)
 
+env_flag('MOZ_ANDROID_APZ',
+         help='Enable the C++ async pan/zoom code instead of the Java version',
+         default=True,
+         set_as_define=True,
+         name='--enable-android-apz')
+
 @depends(target)
 def check_target(target):
     if target.os != 'Android':
         log.error('You must specify --target=arm-linux-androideabi (or some '
                   'other valid Android target) when building mobile/android.')
         die('See https://developer.mozilla.org/docs/Mozilla/Developer_guide/'
             'Build_Instructions/Simple_Firefox_for_Android_build '
             'for more information about the necessary options.')

--- a/old-configure.in
+++ b/old-configure.in
@@ -2718,17 +2718,16 @@ LIBJPEG_TURBO_ASFLAGS=
 MOZ_PERMISSIONS=1
 MOZ_PLACES=1
 MOZ_SOCIAL=1
 MOZ_PREF_EXTENSIONS=1
 MOZ_REFLOW_PERF=
 MOZ_SAFE_BROWSING=
 MOZ_HELP_VIEWER=
 MOZ_SPELLCHECK=1
-MOZ_ANDROID_APZ=
 MOZ_TOOLKIT_SEARCH=1
 MOZ_UI_LOCALE=en-US
 MOZ_UNIVERSALCHARDET=1
 MOZ_URL_CLASSIFIER=
 MOZ_XUL=1
 MOZ_ZIPWRITER=1
 NS_PRINTING=1
 if test "$MOZ_IOS"; then
@@ -3532,28 +3531,16 @@ if test -n "$MOZ_ANDROID_HISTORY"; then
     if test -z "$MOZ_PLACES"; then
         AC_DEFINE(MOZ_ANDROID_HISTORY)
     else
         AC_MSG_ERROR([Cannot use MOZ_ANDROID_HISTORY alongside MOZ_PLACES.])
     fi
 fi
 
 dnl ========================================================
-dnl = Enable the C++ async pan/zoom code instead of the Java version
-dnl ========================================================
-MOZ_ARG_ENABLE_BOOL(android-apz,
-[  --enable-android-apz      Switch to C++ pan/zoom code],
-    MOZ_ANDROID_APZ=1,
-    MOZ_ANDROID_APZ=)
-if test -n "$MOZ_ANDROID_APZ"; then
-     dnl Do this if defined in confvars.sh
-     AC_DEFINE(MOZ_ANDROID_APZ)
-fi
-
-dnl ========================================================
 dnl = Disable WebSMS backend
 dnl ========================================================
 MOZ_ARG_DISABLE_BOOL(websms-backend,
 [  --disable-websms-backend
                            Disable WebSMS backend],
     MOZ_WEBSMS_BACKEND=,
     MOZ_WEBSMS_BACKEND=1)
 
@@ -6751,17 +6738,16 @@ AC_SUBST(JAVAH)
 AC_SUBST(JAR)
 AC_SUBST(JARSIGNER)
 AC_SUBST(KEYTOOL)
 
 AC_SUBST(ENABLE_TESTS)
 AC_SUBST(MOZ_UNIVERSALCHARDET)
 AC_SUBST(ACCESSIBILITY)
 AC_SUBST(MOZ_SPELLCHECK)
-AC_SUBST(MOZ_ANDROID_APZ)
 AC_SUBST(MOZ_ANDROID_ANR_REPORTER)
 AC_SUBST(MOZ_CRASHREPORTER)
 AC_SUBST(MOZ_CRASHREPORTER_INJECTOR)
 AC_SUBST(MOZ_CRASHREPORTER_UPLOAD_FULL_SYMBOLS)
 AC_SUBST(MOZ_MAINTENANCE_SERVICE)
 AC_SUBST(MOZ_STUB_INSTALLER)
 AC_SUBST(MOZ_VERIFY_MAR_SIGNATURE)
 AC_SUBST(MOZ_ENABLE_SIGNMAR)