[Android] Roll android_tools to Android M SDK.

Partially stolen from https://codereview.chromium.org/1297273003/

Android SDK tools 24.3.3 -> 24.3.4
Android Platform tools 22 -> 23
Android SDK build tools 22 -> 23
Android SDK 5.1.1 (API 22) -> 6.0 (API 23)
Android Support Library -> 23.0.0

This also rolls:
Reland x86 toolchain from NDK r10e with a fix of "-mstackrealign" flag.
Add GCM to the Google Play Services Library.

BUG=522182,521527
TBR=sievers@chromium.org
NOTRY=true

patch from issue 1297273003 at patchset 60001 (http://crrev.com/1297273003#ps60001)

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

Cr-Original-Commit-Position: refs/heads/master@{#344409}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 0d414de1c4a951509b5e8a0fc75e8dbba4c0e22b

android/pylib/constants/__init__.py

@@ -178,9 +178,10 @@ class ANDROID_SDK_VERSION_CODES(object):
   KITKAT_WATCH = 20
   LOLLIPOP = 21
   LOLLIPOP_MR1 = 22
+  MARSHMALLOW = 23
 
 ANDROID_SDK_VERSION = ANDROID_SDK_VERSION_CODES.LOLLIPOP_MR1
-ANDROID_SDK_BUILD_TOOLS_VERSION = '22.0.0'
+ANDROID_SDK_BUILD_TOOLS_VERSION = '23.0.0'
 ANDROID_SDK_ROOT = os.path.join(DIR_SOURCE_ROOT,
                                 'third_party/android_tools/sdk')
 ANDROID_SDK_TOOLS = os.path.join(ANDROID_SDK_ROOT,

common.gypi

@@ -1715,8 +1715,8 @@
             'android_ndk_absolute_root%': '<!(cd <(DEPTH) && pwd -P)/third_party/android_tools/ndk/',
             'android_host_arch%': '<!(uname -m)',
             # Android API-level of the SDK used for compilation.
-            'android_sdk_version%': '22',
-            'android_sdk_build_tools_version%': '22.0.0',
+            'android_sdk_version%': '23',
+            'android_sdk_build_tools_version%': '23.0.0',
             'host_os%': "<!(uname -s | sed -e 's/Linux/linux/;s/Darwin/mac/')",
 
             'conditions': [
@@ -3955,9 +3955,15 @@
                 'conditions': [
                   # Use gold linker for Android ia32 target.
                   ['OS=="android"', {
+                     # Use gold linker for Android ia32 target.
                     'ldflags': [
                       '-fuse-ld=gold',
                     ],
+                    # Use -mstackrealign due to a bug on ia32 Jelly Bean.
+                    # See crbug.com/521527
+                    'cflags': [
+                      '-mstackrealign',
+                    ],
                   }],
                 ],
               }],

config/android/config.gni

@@ -16,8 +16,8 @@ if (is_android) {
 
   if (!defined(default_android_sdk_root)) {
     default_android_sdk_root = "//third_party/android_tools/sdk"
-    default_android_sdk_version = "22"
-    default_android_sdk_build_tools_version = "22.0.0"
+    default_android_sdk_version = "23"
+    default_android_sdk_build_tools_version = "23.0.0"
   }
 
   if (!defined(google_play_services_library)) {

config/compiler/BUILD.gn

@@ -571,6 +571,12 @@ config("compiler") {
         # Let clang find the ld.gold in the NDK.
         ldflags += [ "--gcc-toolchain=$rebased_android_toolchain_root" ]
       }
+
+      # Use -mstackrealign due to a bug on ia32 Jelly Bean.
+      # See crbug.com/521527
+      if (current_cpu == "x86") {
+        cflags += [ "-mstackrealign" ]
+      }
     }
 
     ldflags += [

secondary/third_party/android_tools/BUILD.gn

@@ -114,6 +114,7 @@ android_java_prebuilt("google_play_services_default_java") {
     ":android_support_v13_java",
     ":android_support_v7_mediarouter_java",
     ":google_play_services_default_resources",
+    ":legacy_http_javalib",
   ]
   proguard_preprocess = true
   proguard_config = "//third_party/android_tools/proguard.flags"
@@ -142,3 +143,8 @@ action("check_sdk_extras_version") {
     "$target_gen_dir/checked_sdk_extras_version.stamp",
   ]
 }
+
+# TODO(jbudorick): Remove this once net_java_test_support no longer needs it.
+android_java_prebuilt("legacy_http_javalib") {
+  jar_path = "$android_sdk/optional/org.apache.http.legacy.jar"
+}