--- a/build/moz.configure/init.configure
+++ b/build/moz.configure/init.configure
@@ -268,16 +268,17 @@ def wanted_mozconfig_variables(help):
          'MOZ_CALLGRIND',
          'MOZ_DMD',
          'MOZ_FMP4',
          'MOZ_INSTRUMENT_EVENT_LOOP',
          'MOZ_INSTRUMENTS',
          'MOZ_JPROF',
          'MOZ_LOCALE_SWITCHER',
          'MOZ_PROFILING',
+         'MOZ_SWITCHBOARD',
          'MOZ_USE_SYSTRACE',
          'MOZ_VTUNE',
          'MOZTTDIR',
          'PERL',
          'RPMBUILD',
          'TAR',
          'UNZIP',
          'USE_FC_FREETYPE',

--- a/mobile/android/confvars.sh
+++ b/mobile/android/confvars.sh
@@ -79,13 +79,8 @@ export JS_GC_SMALL_CHUNK_SIZE=1
 
 # Enable GCM registration on Nightly builds only.
 if test "$NIGHTLY_BUILD"; then
   MOZ_ANDROID_GCM=1
 fi
 
 # Enable checking that add-ons are signed by the trusted root
 MOZ_ADDON_SIGNING=1
-
-# Enable the Switchboard A/B framework code.
-# Note: The framework is always included in the app. This flag controls
-# usage of the framework.
-MOZ_SWITCHBOARD=1

--- a/mobile/android/moz.configure
+++ b/mobile/android/moz.configure
@@ -54,16 +54,22 @@ def search_activity(value):
 def enabled_define(name, help):
     opt = option(env=name, default='1', help=help)
 
     @depends(opt.option)
     def enabled_option(value):
         if value:
             set_define(name, '1')
 
+# Enable the Switchboard A/B framework code.
+# Note: The framework is always included in the app. This flag controls
+# usage of the framework.
+enabled_define('MOZ_SWITCHBOARD',
+               help='Include Switchboard A/B framework on Android')
+
 enabled_define('MOZ_ANDROID_BEAM',
                help='Enable NFC permission on Android')
 
 enabled_define('MOZ_ANDROID_DOWNLOADS_INTEGRATION',
                help='Enable system download manager on Android')
 
 enabled_define('MOZ_LOCALE_SWITCHER',
                help='Enable runtime locale switching on Android')

--- a/old-configure.in
+++ b/old-configure.in
@@ -2922,17 +2922,16 @@ if test -n "$MOZ_RTSP"; then
 fi
 USE_ARM_KUSER=
 BUILD_CTYPES=1
 MOZ_USE_NATIVE_POPUP_WINDOWS=
 MOZ_ANDROID_HISTORY=
 MOZ_WEBSMS_BACKEND=
 MOZ_EXCLUDE_HYPHENATION_DICTIONARIES=
 MOZ_INSTALL_TRACKING=
-MOZ_SWITCHBOARD=
 ACCESSIBILITY=1
 MOZ_TIME_MANAGER=
 MOZ_SIMPLEPUSH=
 MOZ_PAY=
 MOZ_AUDIO_CHANNEL_MANAGER=
 MOZ_CONTENT_SANDBOX=
 MOZ_GMP_SANDBOX=
 MOZ_SANDBOX=1
@@ -3790,22 +3789,16 @@ fi
 
 dnl ========================================================
 dnl = Include install tracking on Android
 dnl ========================================================
 if test -n "$MOZ_INSTALL_TRACKING"; then
     AC_DEFINE(MOZ_INSTALL_TRACKING)
 fi
 
-dnl ========================================================
-dnl = Include Switchboard A/B framework on Android
-dnl ========================================================
-if test -n "$MOZ_SWITCHBOARD"; then
-    AC_DEFINE(MOZ_SWITCHBOARD)
-fi
 
 dnl ========================================================
 dnl = Enable GCM on Android.
 dnl ========================================================
 if test -n "$MOZ_ANDROID_GCM"; then
     AC_DEFINE(MOZ_ANDROID_GCM)
 fi
 
@@ -7273,17 +7266,16 @@ AC_SUBST(MOZ_DISABLE_GECKOVIEW)
 AC_SUBST(MOZ_ANDROID_GCM)
 AC_SUBST(MOZ_ANDROID_GECKOLIBS_AAR)
 AC_SUBST(MOZ_ANDROID_PACKAGE_INSTALL_BOUNCER)
 AC_SUBST(MOZ_ANDROID_APPLICATION_CLASS)
 AC_SUBST(MOZ_ANDROID_BROWSER_INTENT_CLASS)
 AC_SUBST(MOZ_ANDROID_SEARCH_INTENT_CLASS)
 AC_SUBST(MOZ_EXCLUDE_HYPHENATION_DICTIONARIES)
 AC_SUBST(MOZ_INSTALL_TRACKING)
-AC_SUBST(MOZ_SWITCHBOARD)
 AC_SUBST(ENABLE_STRIP)
 AC_SUBST(PKG_SKIP_STRIP)
 AC_SUBST(STRIP_FLAGS)
 AC_SUBST(USE_ELF_HACK)
 AC_SUBST(INCREMENTAL_LINKER)
 AC_SUBST(MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS)
 AC_SUBST(MOZ_COMPONENT_NSPR_LIBS)
 

--- a/toolkit/modules/AppConstants.jsm
+++ b/toolkit/modules/AppConstants.jsm
@@ -111,23 +111,16 @@ this.AppConstants = Object.freeze({
 
   MOZ_UPDATER:
 #ifdef MOZ_UPDATER
   true,
 #else
   false,
 #endif
 
-  MOZ_SWITCHBOARD:
-#ifdef MOZ_SWITCHBOARD
-  true,
-#else
-  false,
-#endif
-
   MOZ_WEBRTC:
 #ifdef MOZ_WEBRTC
   true,
 #else
   false,
 #endif
 
 # MOZ_B2G covers both device and desktop b2g