Revert of [android] Migrate more configs to gyp. (patchset #4 id:60001 of...

Revert of [android] Migrate more configs to gyp. (patchset #4 id:60001 of https://codereview.chromium.org/1207693004/)

Reason for revert:
Breaks arm64 bots.

Original issue's description:
> [android] Migrate more configs to gyp.
>
> BUG=chromium:502176
> LOG=n
>
> Committed: https://crrev.com/174869573e42c999da1489c264b9c4602b98ba31
> Cr-Commit-Position: refs/heads/master@{#29314}

TBR=jochen@chromium.org,ulan@chromium.org,dusan.milosavljevic@imgtec.com,machenbach@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=chromium:502176

Review URL: https://codereview.chromium.org/1211383002

Cr-Commit-Position: refs/heads/master@{#29316}

Makefile.android

@@ -35,24 +35,28 @@ MODES = release debug
 ANDROID_BUILDS = $(foreach mode,$(MODES), \
                    $(addsuffix .$(mode),$(ANDROID_ARCHES)))
 
+HOST_OS = $(shell uname -s | sed -e 's/Linux/linux/;s/Darwin/mac/')
+
 ifeq ($(ARCH), android_arm)
-  DEFINES  = target_arch=arm v8_target_arch=arm
+  DEFINES  = target_arch=arm v8_target_arch=arm android_target_arch=arm android_target_platform=16
+  DEFINES += arm_neon=0 arm_version=7
 else ifeq ($(ARCH), android_arm64)
-  DEFINES  = target_arch=arm64 v8_target_arch=arm64
+  DEFINES  = target_arch=arm64 v8_target_arch=arm64 android_target_arch=arm64 android_target_platform=21
 else ifeq ($(ARCH), android_mipsel)
-  DEFINES  = target_arch=mipsel v8_target_arch=mipsel
+  DEFINES  = target_arch=mipsel v8_target_arch=mipsel android_target_platform=16
+  DEFINES += android_target_arch=mips mips_arch_variant=mips32r2
 else ifeq ($(ARCH), android_ia32)
-  DEFINES = target_arch=ia32 v8_target_arch=ia32
+  DEFINES = target_arch=ia32 v8_target_arch=ia32 android_target_arch=x86 android_target_platform=16
 else ifeq ($(ARCH), android_x64)
-  DEFINES = target_arch=x64 v8_target_arch=x64
+  DEFINES = target_arch=x64 v8_target_arch=x64 android_target_arch=x86_64 android_target_platform=21
 else ifeq ($(ARCH), android_x87)
-  DEFINES = target_arch=ia32 v8_target_arch=x87
+  DEFINES = target_arch=x87 v8_target_arch=x87 android_target_arch=x86 android_target_platform=16
 else
   $(error Target architecture "${ARCH}" is not supported)
 endif
 
 # Common flags.
-DEFINES += OS=android
+DEFINES += host_os=${HOST_OS} OS=android
 
 .SECONDEXPANSION:
 $(ANDROID_BUILDS): $(OUTDIR)/Makefile.$$@

build/standalone.gypi

@@ -222,49 +222,31 @@
 
           # Copy conditionally-set variables out one scope.
           'android_ndk_root%': '<(android_ndk_root)',
-          'host_os%': '<(host_os)',
 
           'conditions': [
             ['target_arch == "ia32"', {
               'android_toolchain%': '<(android_ndk_root)/toolchains/x86-4.9/prebuilt/<(host_os)-<(android_host_arch)/bin',
-              'android_target_arch%': 'x86',
-              'android_target_platform%': '16',
             }],
             ['target_arch == "x64"', {
               'android_toolchain%': '<(android_ndk_root)/toolchains/x86_64-4.9/prebuilt/<(host_os)-<(android_host_arch)/bin',
-              'android_target_arch%': 'x86_64',
-              'android_target_platform%': '21',
             }],
             ['target_arch=="arm"', {
               'android_toolchain%': '<(android_ndk_root)/toolchains/arm-linux-androideabi-4.9/prebuilt/<(host_os)-<(android_host_arch)/bin',
-              'android_target_arch%': 'arm',
-              'android_target_platform%': '16',
-              'arm_version%': 7,
             }],
             ['target_arch == "arm64"', {
               'android_toolchain%': '<(android_ndk_root)/toolchains/aarch64-linux-android-4.9/prebuilt/<(host_os)-<(android_host_arch)/bin',
-              'android_target_arch%': 'arm64',
-              'android_target_platform%': '21',
             }],
             ['target_arch == "mipsel"', {
               'android_toolchain%': '<(android_ndk_root)/toolchains/mipsel-linux-android-4.9/prebuilt/<(host_os)-<(android_host_arch)/bin',
-              'android_target_arch%': 'mips',
-              'android_target_platform%': '16',
             }],
             ['target_arch == "mips64el"', {
               'android_toolchain%': '<(android_ndk_root)/toolchains/mips64el-linux-android-4.9/prebuilt/<(host_os)-<(android_host_arch)/bin',
-              'android_target_arch%': 'mips64',
-              'android_target_platform%': '21',
             }],
           ],
         },
 
         # Copy conditionally-set variables out one scope.
-        'android_target_arch%': '<(android_target_arch)',
-        'android_target_platform%': '<(android_target_platform)',
         'android_toolchain%': '<(android_toolchain)',
-        'arm_version%': '<(arm_version)',
-        'host_os%': '<(host_os)',
 
         'conditions': [
           ['android_ndk_root==""', {
@@ -328,11 +310,6 @@
   'target_defaults': {
     'variables': {
       'v8_code%': '<(v8_code)',
-      'conditions':[
-        ['OS=="android"', {
-          'host_os%': '<(host_os)',
-        }],
-      ],
     },
     'default_configuration': 'Debug',
     'configurations': {