Roll src/third_party/android_tools/ cb6bc2110..023e2f654 (1 commit).

https://chromium.googlesource.com/android_tools.git/+log/cb6bc2110..023e2f654

023e2f6 Roll NDK to pick std::deque patch.

BUG=674287

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

DEPS

@@ -464,7 +464,7 @@ deps_os = {
       Var('chromium_git') + '/external/android_protobuf.git' + '@' + '999188d0dc72e97f7fe08bb756958a2cf090f4e7',
 
     'src/third_party/android_tools':
-      Var('chromium_git') + '/android_tools.git' + '@' + 'cb6bc21107001e2f2eeee2707b482b2b755baf51',
+      Var('chromium_git') + '/android_tools.git' + '@' + '023e2f65409a2b7886b8d644d6a88542ead6cd0a',
 
     'src/third_party/apache-portable-runtime/src':
       Var('chromium_git') + '/external/apache-portable-runtime.git' + '@' + 'c76a8c4277e09a82eaa229e35246edea1ee0a6a1',

build/config/android/BUILD.gn

@@ -22,8 +22,9 @@ config("compiler") {
     # does. Define them here instead.
     "HAVE_SYS_UIO_H",
 
-    # Forces full rebuilds on NDK rolls.
-    "ANDROID_NDK_VERSION=${android_ndk_version}",
+    # Forces full rebuilds on NDK rolls. To rebuild everything when NDK version
+    # stays the same, increment the suffix number.
+    "ANDROID_NDK_VERSION_ROLL=${android_ndk_version}_1",
   ]
 
   if (is_clang) {