[chromium_android recipes] Cleanup envsetup step and cleanup step names.

scripts/slave/recipe_modules/chromium/config.expected/Release-win.intel.64-to-win.intel.64.json

Index: scripts/slave/recipe_modules/chromium/config.expected/Release-win.intel.64-to-win.intel.64.json
diff --git a/scripts/slave/recipe_modules/chromium/config.expected/Release-win.intel.64-to-win.intel.64.json b/scripts/slave/recipe_modules/chromium/config.expected/Release-win.intel.64-to-win.intel.64.json
index ad615a23ce2804b897876e0c1fa5385510cd450d..51cfee05665c7ce24f3c45d6deea31ceb3d2619c 100644
--- a/scripts/slave/recipe_modules/chromium/config.expected/Release-win.intel.64-to-win.intel.64.json
+++ b/scripts/slave/recipe_modules/chromium/config.expected/Release-win.intel.64-to-win.intel.64.json
@@ -9,8 +9,10 @@
       ]
     }, 
     "gyp_env": {
-      "GYP_DEFINES": "component=static_library fastbuild=1 target_arch=x64", 
+      "GYP_CROSSCOMPILE": 1, 
+      "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gcc_version=46 host_os=linux order_text_section=['orderfiles', 'orderfile.out'] target_arch=arm", 
       "GYP_GENERATORS": "ninja", 
+      "GYP_GENERATOR_FLAGS": "default_target=All", 
       "GYP_MSVS_VERSION": "2012"
     }
   }, 
@@ -58,8 +60,10 @@
       ]
     }, 
     "gyp_env": {
-      "GYP_DEFINES": "chromium_win_pch=0 clang=1 component=static_library fastbuild=1 target_arch=x64", 
+      "GYP_CROSSCOMPILE": 1, 
+      "GYP_DEFINES": "OS=android chromium_win_pch=0 clang=1 component=static_library fastbuild=1 gcc_version=46 host_os=linux order_text_section=['orderfiles', 'orderfile.out'] target_arch=arm", 
       "GYP_GENERATORS": "ninja", 
+      "GYP_GENERATOR_FLAGS": "default_target=All", 
       "GYP_MSVS_VERSION": "2012"
     }
   }, 
@@ -74,8 +78,10 @@
       ]
     }, 
     "gyp_env": {
-      "GYP_DEFINES": "chromium_win_pch=0 component=shared_library fastbuild=1 target_arch=x64", 
+      "GYP_CROSSCOMPILE": 1, 
+      "GYP_DEFINES": "OS=android chromium_win_pch=0 component=shared_library fastbuild=1 gcc_version=46 host_os=linux order_text_section=['orderfiles', 'orderfile.out'] target_arch=arm", 
       "GYP_GENERATORS": "ninja", 
+      "GYP_GENERATOR_FLAGS": "default_target=All", 
       "GYP_MSVS_VERSION": "2012"
     }
   }, 
@@ -90,8 +96,10 @@
       ]
     }, 
     "gyp_env": {
-      "GYP_DEFINES": "chromium_win_pch=0 component=static_library fastbuild=1 target_arch=x64", 
+      "GYP_CROSSCOMPILE": 1, 
+      "GYP_DEFINES": "OS=android chromium_win_pch=0 component=static_library fastbuild=1 gcc_version=46 host_os=linux order_text_section=['orderfiles', 'orderfile.out'] target_arch=arm", 
       "GYP_GENERATORS": "ninja", 
+      "GYP_GENERATOR_FLAGS": "default_target=All", 
       "GYP_MSVS_VERSION": "2012"
     }
   }, 
@@ -106,8 +114,10 @@
       ]
     }, 
     "gyp_env": {
-      "GYP_DEFINES": "chromium_win_pch=0 component=static_library fastbuild=1 target_arch=x64", 
+      "GYP_CROSSCOMPILE": 1, 
+      "GYP_DEFINES": "OS=android chromium_win_pch=0 component=static_library fastbuild=1 gcc_version=46 host_os=linux order_text_section=['orderfiles', 'orderfile.out'] target_arch=arm", 
       "GYP_GENERATORS": "ninja", 
+      "GYP_GENERATOR_FLAGS": "default_target=All", 
       "GYP_MSVS_VERSION": "2012"
     }
   }, 
@@ -147,8 +157,10 @@
       ]
     }, 
     "gyp_env": {
-      "GYP_DEFINES": "chromium_win_pch=0 component=static_library fastbuild=1 target_arch=x64", 
+      "GYP_CROSSCOMPILE": 1, 
+      "GYP_DEFINES": "OS=android chromium_win_pch=0 component=static_library fastbuild=1 gcc_version=46 host_os=linux order_text_section=['orderfiles', 'orderfile.out'] target_arch=arm", 
       "GYP_GENERATORS": "ninja", 
+      "GYP_GENERATOR_FLAGS": "default_target=All", 
       "GYP_MSVS_VERSION": "2012"
     }
   }, 
@@ -177,8 +189,10 @@
       ]
     }, 
     "gyp_env": {
-      "GYP_DEFINES": "chromium_win_pch=0 component=static_library fastbuild=1 target_arch=x64", 
+      "GYP_CROSSCOMPILE": 1, 
+      "GYP_DEFINES": "OS=android chromium_win_pch=0 component=static_library fastbuild=1 gcc_version=46 host_os=linux order_text_section=['orderfiles', 'orderfile.out'] target_arch=arm", 
       "GYP_GENERATORS": "ninja", 
+      "GYP_GENERATOR_FLAGS": "default_target=All", 
       "GYP_MSVS_VERSION": "2012"
     }
   },