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

The enable_themes and enable_extensions gyp variables were in a different
scope that prevented the grit_defines from having the correct value when
evaluating the condition.  Moves the variable assignment into the same
scope as the variable declaration and now everything is happy.

TEST=touch chrome/browser/browser_resources.grd && \
     make chrome_resources (check about_version does not have theme icon)

BUG=


Review URL: https://chromiumcodereview.appspot.com/10828396

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152455 0039d316-1c4b-4281-b951-d872f2087c98

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,