[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

 {
   "android_defaults": {
     "build_config_fs": "Release_x64", 
     "build_dir": "out", 
     "compile_py": {
       "build_tool": "ninja", 
       "default_targets": [
         "All"
       ]
     }, 
     "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"
     }
   }, 
   "blink": {
     "build_config_fs": "Release_x64", 
     "build_dir": "out", 
     "compile_py": {
       "build_tool": "ninja", 
       "compiler": "goma", 
       "default_targets": [
@@ skipping 27 matching lines @@
     "build_config_fs": "Release_x64", 
     "build_dir": "out", 
     "compile_py": {
       "build_tool": "ninja", 
       "compiler": "goma-clang", 
       "default_targets": [
         "All"
       ]
     }, 
     "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"
     }
   }, 
   "component_builder": {
     "build_config_fs": "Release_x64", 
     "build_dir": "out", 
     "compile_py": {
       "build_tool": "ninja", 
       "compiler": "goma", 
       "default_targets": [
         "All"
       ]
     }, 
     "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"
     }
   }, 
   "klp_builder": {
     "build_config_fs": "Release_x64", 
     "build_dir": "out", 
     "compile_py": {
       "build_tool": "ninja", 
       "compiler": "goma", 
       "default_targets": [
         "All"
       ]
     }, 
     "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"
     }
   }, 
   "main_builder": {
     "build_config_fs": "Release_x64", 
     "build_dir": "out", 
     "compile_py": {
       "build_tool": "ninja", 
       "compiler": "goma", 
       "default_targets": [
         "All"
       ]
     }, 
     "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"
     }
   }, 
   "msvs": {
     "build_config_fs": "Release_x64", 
     "build_dir": "out", 
     "compile_py": {
       "build_tool": "msvs"
     }, 
     "gyp_env": {
@@ skipping 19 matching lines @@
     "build_config_fs": "Release_x64", 
     "build_dir": "out", 
     "compile_py": {
       "build_tool": "ninja", 
       "compiler": "goma", 
       "default_targets": [
         "All"
       ]
     }, 
     "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"
     }
   }, 
   "v8": {
     "build_config_fs": "Release", 
     "build_dir": "", 
     "compile_py": {
       "build_tool": "make", 
       "default_targets": [
         "buildbot"
       ]
     }, 
     "gyp_env": {
       "GYP_DEFINES": "target_arch=x64 v8_target_arch=x64", 
       "GYP_MSVS_VERSION": "2012"
     }
   }, 
   "x86_builder": {
     "build_config_fs": "Release_x64", 
     "build_dir": "out", 
     "compile_py": {
       "build_tool": "ninja", 
       "compiler": "goma", 
       "default_targets": [
         "All"
       ]
     }, 
     "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"
     }
   }, 
   "xcodebuild": "can not use xcodebuild on \"win\""
 }