[chormium_android api] Set KLP and x86 GYP_DEFINES.

scripts/slave/recipes/android/android_builder.expected/x86_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 104 matching lines @@
   {
     "cmd": [
       "python",
       "-u",
       "[DEPOT_TOOLS_ROOT]/gclient.py",
       "runhooks"
     ],
     "env": {
       "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_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=x86",
       "GYP_GENERATORS": "ninja",
       "GYP_GENERATOR_FLAGS": "default_target=All",
       "PATH": "[BUILD_INTERNAL_ROOT]/scripts/slave/android:./:%(PATH)s"
     },
     "name": "gclient runhooks"
   },
   {
     "abort_on_failure": true,
     "cmd": [
       "python",
@@ skipping 11 matching lines @@
       "goma",
       "--",
       "All"
     ],
     "env": {
       "PATH": "[BUILD_INTERNAL_ROOT]/scripts/slave/android:./:%(PATH)s"
     },
     "name": "compile"
   }
 ]