[build] Roll android_tools to 04c2c06

This ports:
https://codereview.chromium.org/1991343002

BUG=chromium:599327

Review-Url: https://codereview.chromium.org/2040913002
Cr-Commit-Position: refs/heads/master@{#36730}

DEPS

@@ -37,7 +37,7 @@ deps = {
 deps_os = {
   "android": {
     "v8/third_party/android_tools":
-      Var("git_url") + "/android_tools.git" + "@" + "5b5f2f60b78198eaef25d442ac60f823142a8a6e",
+      Var("git_url") + "/android_tools.git" + "@" + "04c2c06fe3ef3d93343feb6e83cd932725740d7f",
   },
   "win": {
     "v8/third_party/cygwin":
@@ -45,6 +45,8 @@ deps_os = {
   }
 }
 
+recursedeps = [ 'v8/third_party/android_tools' ]
+
 include_rules = [
   # Everybody can use some things.
   "+include",

gypfiles/standalone.gypi

@@ -286,12 +286,15 @@
             # because it is used at different levels in the GYP files.
             'android_ndk_root%': '<(base_dir)/third_party/android_tools/ndk/',
             'android_host_arch%': "<!(uname -m | sed -e 's/i[3456]86/x86/')",
+            # Version of the NDK. Used to ensure full rebuilds on NDK rolls.
+            'android_ndk_version%': 'r11c',
             'host_os%': "<!(uname -s | sed -e 's/Linux/linux/;s/Darwin/mac/')",
             'os_folder_name%': "<!(uname -s | sed -e 's/Linux/linux/;s/Darwin/darwin/')",
           },
 
           # Copy conditionally-set variables out one scope.
           'android_ndk_root%': '<(android_ndk_root)',
+          'android_ndk_version%': '<(android_ndk_version)',
           'host_os%': '<(host_os)',
           'os_folder_name%': '<(os_folder_name)',
 
@@ -336,6 +339,7 @@
         },
 
         # Copy conditionally-set variables out one scope.
+        'android_ndk_version%': '<(android_ndk_version)',
         'android_target_arch%': '<(android_target_arch)',
         'android_target_platform%': '<(android_target_platform)',
         'android_toolchain%': '<(android_toolchain)',
@@ -1116,6 +1120,7 @@
               'HAVE_OFF64_T',
               'HAVE_SYS_UIO_H',
               'ANDROID_BINSIZE_HACK', # Enable temporary hacks to reduce binsize.
+              'ANDROID_NDK_VERSION=<(android_ndk_version)',
             ],
             'ldflags!': [
               '-pthread',  # Not supported by Android toolchain.