--- a/build/autoconf/android.m4
+++ b/build/autoconf/android.m4
@@ -342,18 +342,16 @@ if test -n "$MOZ_NATIVE_DEVICES" ; then
 fi
 
 ])
 
 AC_DEFUN([MOZ_ANDROID_GOOGLE_CLOUD_MESSAGING],
 [
 
 if test -n "$MOZ_ANDROID_GCM" ; then
-    AC_SUBST(MOZ_ANDROID_GCM)
-
     MOZ_ANDROID_AAR(play-services-base, 8.1.0, google, com/google/android/gms)
     MOZ_ANDROID_AAR(play-services-basement, 8.1.0, google, com/google/android/gms)
     MOZ_ANDROID_AAR(play-services-gcm, 8.1.0, google, com/google/android/gms)
 fi
 
 ])
 
 AC_DEFUN([MOZ_ANDROID_INSTALL_TRACKING],

--- a/build/moz.configure/init.configure
+++ b/build/moz.configure/init.configure
@@ -256,16 +256,17 @@ def wanted_mozconfig_variables(help):
          'EXTERNAL_SOURCE_DIR',
          'GENISOIMAGE',
          'L10NBASEDIR',
          'MOZILLABUILD',
          'MOZ_ANDROID_BEAM',
          'MOZ_ANDROID_DOWNLOAD_CONTENT_SERVICE',
          'MOZ_ANDROID_DOWNLOADS_INTEGRATION',
          'MOZ_ANDROID_EXCLUDE_FONTS',
+         'MOZ_ANDROID_GCM',
          'MOZ_ANDROID_MLS_STUMBLER',
          'MOZ_ANDROID_SEARCH_ACTIVITY',
          'MOZ_ARTIFACT_BUILDS',
          'MOZ_BUILD_APP',
          'MOZ_CALLGRIND',
          'MOZ_DMD',
          'MOZ_FMP4',
          'MOZ_INSTRUMENT_EVENT_LOOP',

--- a/mobile/android/moz.configure
+++ b/mobile/android/moz.configure
@@ -1,14 +1,26 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+option(env='MOZ_ANDROID_GCM',
+       help='Enable GCM on Android.')
+
+@depends('MOZ_ANDROID_GCM', milestone)
+def android_gsm(value, milestone):
+    if value or milestone.is_nightly:
+        set_define('MOZ_ANDROID_GCM', '1')
+        set_config('MOZ_ANDROID_GCM', '1')
+        # This value is tested in android.m4.
+        add_old_configure_assignment('MOZ_ANDROID_GCM', '1')
+    else:
+        set_config('MOZ_ANDROID_GCM', '')
 
 option(env='MOZ_ANDROID_DOWNLOAD_CONTENT_SERVICE',
        help='Background service for downloading additional content at runtime.')
 
 @depends('MOZ_ANDROID_DOWNLOAD_CONTENT_SERVICE', milestone)
 def download_content_service(value, milestone):
     # Enable DLC background service in Nightly
     if value or milestone.is_nightly:

--- a/old-configure.in
+++ b/old-configure.in
@@ -3791,23 +3791,16 @@ dnl ====================================
 dnl = Include install tracking on Android
 dnl ========================================================
 if test -n "$MOZ_INSTALL_TRACKING"; then
     AC_DEFINE(MOZ_INSTALL_TRACKING)
 fi
 
 
 dnl ========================================================
-dnl = Enable GCM on Android.
-dnl ========================================================
-if test -n "$MOZ_ANDROID_GCM"; then
-    AC_DEFINE(MOZ_ANDROID_GCM)
-fi
-
-dnl ========================================================
 dnl = Enable IPDL's "expensive" unit tests
 dnl ========================================================
 MOZ_IPDL_TESTS=
 
 MOZ_ARG_ENABLE_BOOL(ipdl-tests,
 [  --enable-ipdl-tests     Enable expensive IPDL tests],
     MOZ_IPDL_TESTS=1,
     MOZ_IPDL_TESTS=)
@@ -7258,17 +7251,16 @@ AC_SUBST(MOZ_D3DCOMPILER_VISTA_DLL)
 AC_SUBST(MOZ_D3DCOMPILER_VISTA_DLL_PATH)
 AC_SUBST(MOZ_DIRECTX_SDK_PATH)
 AC_SUBST(MOZ_D3DCOMPILER_XP_DLL)
 AC_SUBST(MOZ_D3DCOMPILER_XP_CAB)
 
 AC_SUBST(MOZ_ANDROID_HISTORY)
 AC_SUBST(MOZ_WEBSMS_BACKEND)
 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(ENABLE_STRIP)