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

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

Index: scripts/slave/recipes/android/android_builder.expected/x86_builder.json
diff --git a/scripts/slave/recipes/android/android_builder.expected/x86_builder.json b/scripts/slave/recipes/android/android_builder.expected/x86_builder.json
index 34f1b5e20ea0dcac799c860aa71a463f3b859cbf..bb749d4e6c127d7434c5efab7dcbb183930671a2 100644
--- a/scripts/slave/recipes/android/android_builder.expected/x86_builder.json
+++ b/scripts/slave/recipes/android/android_builder.expected/x86_builder.json
@@ -47,7 +47,7 @@
       "--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, @@@",
@@ -67,11 +67,13 @@
       "--target-arch=x86"
     ],
     "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@@@"
@@ -108,7 +110,7 @@
       "src-internal",
       "src/repo"
     ],
-    "name": "Tree Truth Steps"
+    "name": "tree truth steps"
   },
   {
     "cmd": [
@@ -118,7 +120,8 @@
       "runhooks"
     ],
     "env": {
-      "PATH": "./[BUILD_INTERNAL_ROOT]/scripts/slave/android:./"
+      "EXTRA_LANDMINES_SCRIPT": "[SLAVE_BUILD_ROOT]/src/repo/build/get_internal_landmines.py",
+      "PATH": "[BUILD_INTERNAL_ROOT]/scripts/slave/android:./"
     },
     "name": "gclient runhooks"
   },
@@ -141,7 +144,7 @@
       "All"
     ],
     "env": {
-      "PATH": "./[BUILD_INTERNAL_ROOT]/scripts/slave/android:./"
+      "PATH": "[BUILD_INTERNAL_ROOT]/scripts/slave/android:./"
     },
     "name": "compile"
   }