--- a/mobile/android/moz.configure
+++ b/mobile/android/moz.configure
@@ -39,21 +39,23 @@ 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')
+option('--disable-android-apz', env='MOZ_ANDROID_APZ',
+       help='Disable the C++ async pan/zoom code and use the Java version instead')
+
+android_apz = depends_if('--disable-android-apz')(lambda _: True)
+
+set_config('MOZ_ANDROID_APZ', android_apz)
+set_define('MOZ_ANDROID_APZ', 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 '