Move the gyp variables used for grit defines on android to actually work.

build/common.gypi

Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index c038b9d8b5d6fb6f9e4f21f24ddab09aa8b57f51..481c26d02c9dabe0e2b6d2f772d4359e0ad3a95c 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -456,8 +456,11 @@
         }],
 
         ['OS=="android"', {
-          'proprietary_codecs%': 1,
+          'enable_extensions%': 0,
+          'enable_printing%': 0,
+          'enable_themes%': 0,
           'enable_webrtc%': 0,
+          'proprietary_codecs%': 1,
           'remoting%': 0,
         }],
 
@@ -952,9 +955,7 @@
         'configuration_policy%': 0,
         'input_speech%': 0,
         'enable_web_intents%': 0,
-        'enable_extensions%': 0,
         'enable_automation%': 0,
-        'enable_printing%': 0,
         'java_bridge%': 1,
         'build_ffmpegsumo%': 0,
         'linux_use_tcmalloc%': 0,
@@ -962,9 +963,6 @@
         # Disable Native Client.
         'disable_nacl%': 1,
 
-        # Android does not support themes.
-        'enable_themes%': 0,
-
         # Android does not support background apps.
         'enable_background%': 0,