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

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

Index: scripts/slave/recipes/android/android_builder.expected/klp_builder.json
diff --git a/scripts/slave/recipes/android/android_builder.expected/klp_builder.json b/scripts/slave/recipes/android/android_builder.expected/klp_builder.json
index bcdfbcbd3032f4d820dceb8abb58c4c641d8f392..9cf30d7f5492f6daf477c693704c1248bf0c3091 100644
--- a/scripts/slave/recipes/android/android_builder.expected/klp_builder.json
+++ b/scripts/slave/recipes/android/android_builder.expected/klp_builder.json
@@ -47,13 +47,13 @@
       "--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@@@"
     ]
@@ -69,11 +69,13 @@
       "ANDROID_SDK_BUILD_TOOLS_VERSION": "android-KeyLimePie",
       "ANDROID_SDK_ROOT": "[SLAVE_BUILD_ROOT]/src/third_party/android_tools_internal/sdk",
       "ANDROID_SDK_VERSION": "KeyLimePie",
-      "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@@@"
@@ -110,7 +112,7 @@
       "src-internal",
       "src/repo"
     ],
-    "name": "Tree Truth Steps"
+    "name": "tree truth steps"
   },
   {
     "cmd": [
@@ -120,7 +122,15 @@
       "runhooks"
     ],
     "env": {
-      "PATH": "./[BUILD_INTERNAL_ROOT]/scripts/slave/android:./"
+      "ANDROID_SDK_BUILD_TOOLS_VERSION": "android-KeyLimePie",
+      "ANDROID_SDK_ROOT": "[SLAVE_BUILD_ROOT]/src/third_party/android_tools_internal/sdk",
+      "ANDROID_SDK_VERSION": "KeyLimePie",
+      "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"
   },
@@ -143,7 +153,10 @@
       "All"
     ],
     "env": {
-      "PATH": "./[BUILD_INTERNAL_ROOT]/scripts/slave/android:./"
+      "ANDROID_SDK_BUILD_TOOLS_VERSION": "android-KeyLimePie",
+      "ANDROID_SDK_ROOT": "[SLAVE_BUILD_ROOT]/src/third_party/android_tools_internal/sdk",
+      "ANDROID_SDK_VERSION": "KeyLimePie",
+      "PATH": "[BUILD_INTERNAL_ROOT]/scripts/slave/android:./"
     },
     "name": "compile"
   }