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

scripts/slave/recipes/android/android_builder.expected/component_builder.json

 [
   {
     "cmd": [
       "python",
       "-u",
       "[DEPOT_TOOLS_ROOT]/gclient.py",
       "config",
       "--spec",
       "cache_dir = None\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'src/repo', 'url': 'svn://svn.chromium.org/chrome/trunk/src'}]\ntarget_os = ['android']"
     ],
@@ skipping 29 matching lines @@
   {
     "cmd": [
       "[SLAVE_BUILD_ROOT]/src/repo/build/dump_app_manifest_vars.py",
       "-b",
       "builder_name",
       "-v",
       "[SLAVE_BUILD_ROOT]/src/chrome/VERSION",
       "--output-json",
       "/path/to/tmp/json"
     ],
-    "name": "Get AppManifestVars",
+    "name": "get app_manifest_vars",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output@{@@@",
       "@@@STEP_LOG_LINE@json.output@  \"build_id\": 3333, @@@",
       "@@@STEP_LOG_LINE@json.output@  \"date_string\": 6001, @@@",
       "@@@STEP_LOG_LINE@json.output@  \"version_code\": 10, @@@",
-      "@@@STEP_LOG_LINE@json.output@  \"version_name\": \"some builder 1234\"@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"version_name\": \"some_builder_1234\"@@@",
       "@@@STEP_LOG_LINE@json.output@}@@@",
       "@@@STEP_LOG_END@json.output@@@"
     ]
   },
   {
     "cmd": [
       "[SLAVE_BUILD_ROOT]/src/build/env_dump.py",
       "--output-json",
       "/path/to/tmp/json",
       "[SLAVE_BUILD_ROOT]/src/build/android/envsetup.sh"
     ],
     "env": {
-      "EXTRA_LANDMINES_SCRIPT": "[SLAVE_BUILD_ROOT]/src/repo/build/get_internal_landmines.py"
+      "PATH": "[BUILD_INTERNAL_ROOT]/scripts/slave/android:"
     },
     "name": "envsetup",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"GYP_DEFINES\": \"my_new_gyp_def=aaa\", @@@",
+      "@@@STEP_LOG_LINE@json.output@  \"GYP_SOMETHING\": \"gyp_something_value\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"PATH\": \"./\"@@@",
       "@@@STEP_LOG_LINE@json.output@}@@@",
       "@@@STEP_LOG_END@json.output@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "\nimport shutil, sys, os\nshutil.rmtree(sys.argv[1], True)\nshutil.rmtree(sys.argv[2], True)\nfor base, _dirs, files in os.walk(sys.argv[3]):\n  for f in files:\n    if f.endswith('.pyc'):\n      os.remove(os.path.join(base, f))\n",
@@ skipping 16 matching lines @@
   },
   {
     "allow_subannottations": true,
     "cmd": [
       "[SLAVE_BUILD_ROOT]/src/build/tree_truth.sh",
       "[SLAVE_BUILD_ROOT]/src",
       "src",
       "src-internal",
       "src/repo"
     ],
-    "name": "Tree Truth Steps"
+    "name": "tree truth steps"
   },
   {
     "cmd": [
       "python",
       "-u",
       "[DEPOT_TOOLS_ROOT]/gclient.py",
       "runhooks"
     ],
     "env": {
-      "PATH": "./[BUILD_INTERNAL_ROOT]/scripts/slave/android:./"
+      "EXTRA_LANDMINES_SCRIPT": "[SLAVE_BUILD_ROOT]/src/repo/build/get_internal_landmines.py",
+      "GYP_CROSSCOMPILE": 1,
+      "GYP_DEFINES": "OS=android app_manifest_version_code=10 app_manifest_version_name=some_builder_1234 chrome_build_id=3333 component=shared_library fastbuild=1 gcc_version=46 host_os=linux order_text_section=[SLAVE_BUILD_ROOT]/src/orderfiles/orderfile.out target_arch=arm",
+      "GYP_GENERATORS": "ninja",
+      "GYP_GENERATOR_FLAGS": "default_target=All",
+      "PATH": "[BUILD_INTERNAL_ROOT]/scripts/slave/android:./"
     },
     "name": "gclient runhooks"
   },
   {
     "cmd": [
       "python",
       "-u",
       "[BUILD_ROOT]/scripts/slave/compile.py",
       "--target",
       "Debug",
       "--build-dir",
       "[SLAVE_BUILD_ROOT]/src/out",
       "--src-dir",
       "[SLAVE_BUILD_ROOT]/src",
       "--build-tool",
       "ninja",
       "--compiler",
       "goma",
       "--",
       "All"
     ],
     "env": {
-      "PATH": "./[BUILD_INTERNAL_ROOT]/scripts/slave/android:./"
+      "PATH": "[BUILD_INTERNAL_ROOT]/scripts/slave/android:./"
     },
     "name": "compile"
   }
 ]