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

build/config/android/BUILD.gn

Index: build/config/android/BUILD.gn
diff --git a/build/config/android/BUILD.gn b/build/config/android/BUILD.gn
index ea55411920e986b574ef9356eb4cb004e7669914..903bcacfe68217212c5457001e242ca665cf2aa2 100644
--- a/build/config/android/BUILD.gn
+++ b/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",

[jbudorick, 2017/06/08 18:01:21]

I guess I'm ok with this as a short term fix. On thinking about it, I'd like to
do eventually something a bit more automatic here, but doing so shouldn't block
your change.

   ]
 
   if (is_clang) {