diff --git a/DEPS b/DEPS
index a72e6bdfbb6c4a..c430c95b295825 100644
--- a/DEPS
+++ b/DEPS
@@ -428,7 +428,7 @@ deps_os = {
       Var('chromium_git') + '/external/android_protobuf.git' + '@' + '999188d0dc72e97f7fe08bb756958a2cf090f4e7',
 
     'src/third_party/android_tools':
-      Var('chromium_git') + '/android_tools.git' + '@' + '3d6ba29a6693bf3db1343fc213eea47c7d940413',
+      Var('chromium_git') + '/android_tools.git' + '@' + '25d57ead05d3dfef26e9c19b13ed10b0a69829cf',
 
     'src/third_party/apache-mime4j':
       Var('chromium_git') + '/chromium/deps/apache-mime4j.git' + '@' + '28cb1108bff4b6cf0a2e86ff58b3d025934ebe3a',
diff --git a/build/android/BUILD.gn b/build/android/BUILD.gn
index e483048f744c91..688391f9e1f670 100644
--- a/build/android/BUILD.gn
+++ b/build/android/BUILD.gn
@@ -112,10 +112,10 @@ group("test_runner_py") {
            "devil_chromium.json",
            "pylib/gtest/filter/",
            "test_wrapper/logdog_wrapper.py",
-           "//third_party/android_tools/sdk/build-tools/24.0.2/aapt",
-           "//third_party/android_tools/sdk/build-tools/24.0.2/dexdump",
-           "//third_party/android_tools/sdk/build-tools/24.0.2/lib64/libc++.so",
-           "//third_party/android_tools/sdk/build-tools/24.0.2/split-select",
+           "//third_party/android_tools/sdk/build-tools/23.0.1/aapt",
+           "//third_party/android_tools/sdk/build-tools/23.0.1/dexdump",
+           "//third_party/android_tools/sdk/build-tools/23.0.1/lib/libc++.so",
+           "//third_party/android_tools/sdk/build-tools/23.0.1/split-select",
            "//third_party/android_tools/sdk/platform-tools/adb",
            "//third_party/catapult/third_party/gsutil/",
            "//third_party/catapult/devil/devil/devil_dependencies.json",
diff --git a/build/android/devil_chromium.json b/build/android/devil_chromium.json
index 1f9080d115d975..c1157fae9eff78 100644
--- a/build/android/devil_chromium.json
+++ b/build/android/devil_chromium.json
@@ -5,7 +5,7 @@
       "file_info": {
         "linux2_x86_64": {
           "local_paths": [
-            "../../third_party/android_tools/sdk/build-tools/24.0.2/aapt"
+            "../../third_party/android_tools/sdk/build-tools/23.0.1/aapt"
           ]
         }
       }
@@ -32,7 +32,7 @@
       "file_info": {
         "linux2_x86_64": {
           "local_paths": [
-            "../../third_party/android_tools/sdk/build-tools/24.0.2/dexdump"
+            "../../third_party/android_tools/sdk/build-tools/23.0.1/dexdump"
           ]
         }
       }
@@ -41,7 +41,7 @@
       "file_info": {
         "linux2_x86_64": {
           "local_paths": [
-            "../../third_party/android_tools/sdk/build-tools/24.0.2/split-select"
+            "../../third_party/android_tools/sdk/build-tools/23.0.1/split-select"
           ]
         }
       }
diff --git a/build/android/lint/suppressions.xml b/build/android/lint/suppressions.xml
index 11eaa974fa1533..f01174bf02c1d3 100644
--- a/build/android/lint/suppressions.xml
+++ b/build/android/lint/suppressions.xml
@@ -217,22 +217,6 @@ Still reading?
     <ignore path="AndroidManifest.xml"/>
   </issue>
   <issue id="Overdraw" severity="ignore"/>
-  <issue id="Override">
-    <!-- TODO(crbug.com/635567): Fix this properly. -->
-    <ignore regexp="org/chromium/content/browser/input/ReplicaInputConnection.class"/>
-    <!-- TODO(crbug.com/635567): Fix this properly. -->
-    <ignore regexp="org/chromium/content/browser/input/ThreadedInputConnection.class"/>
-    <!-- TODO(crbug.com/635567): Fix this properly. -->
-    <ignore regexp="com/android/webview/chromium/ContentSettingsAdapter.class"/>
-    <!-- TODO(crbug.com/635567): Fix this properly. -->
-    <ignore regexp="com/android/webview/chromium/ServiceWorkerControllerAdapter.class"/>
-    <!-- TODO(crbug.com/635567): Fix this properly. -->
-    <ignore regexp="com/android/webview/chromium/ServiceWorkerSettingsAdapter.class"/>
-    <!-- TODO(crbug.com/635567): Fix this properly. -->
-    <ignore regexp="org/chromium/chrome/browser/ChromeActivity.class"/>
-    <!-- TODO(crbug.com/635567): Fix this properly. -->
-    <ignore regexp="org/chromium/chrome/browser/ChromeTabbedActivity.class"/>
-  </issue>
   <issue id="PackageManagerGetSignatures">
     <ignore regexp="chrome/android/webapk/libs/client/src/org/chromium/webapk/lib/client/WebApkValidator.java"/>
   </issue>
@@ -290,8 +274,6 @@ Still reading?
     <ignore regexp="gen/chrome/android/chrome_strings_grd.resources.zip/values-zh-rCN/android_chrome_strings.xml"/>
     <ignore regexp="gen/chrome/android/chrome_strings_grd.resources.zip/values-zh-rTW/android_chrome_strings.xml"/>
   </issue>
-  <!-- TODO(crbug.com/635567): Fix this properly. -->
-  <issue id="UnusedResources" severity="ignore"/>
   <issue id="UnusedResources">
     <ignore regexp="PRODUCT_DIR/gen/remoting/android/remoting_android_raw_resources/res/raw/credits.html"/>
     <ignore regexp="PRODUCT_DIR/gen/remoting/android/remoting_android_raw_resources/res/raw/credits_css.css"/>
@@ -316,8 +298,7 @@ Still reading?
     <ignore regexp="blimp/client/app/android/java/res/values/dimens.xml"/>
     <ignore regexp="blimp/client/app/android/java/res/xml/about_blimp_preferences.xml"/>
     <ignore regexp="blimp/client/app/android/java/res/xml/blimp_preferences.xml"/>
-    <!-- TODO(crbug.com/635567): Fix this properly. -->
-    <ignore regexp="chrome/android/java/res/drawable-hdpi/*"/>
+    <ignore regexp="chrome/android/java/res/drawable-hdpi/account_management_incognito.png"/>
     <ignore regexp="chrome/android/java/res/drawable-hdpi/amex_card.png"/>
     <ignore regexp="chrome/android/java/res/drawable-hdpi/bubble_white.9.png"/>
     <ignore regexp="chrome/android/java/res/drawable-hdpi/cvc_icon.png"/>
@@ -379,84 +360,6 @@ Still reading?
     <!-- Used by Android's policies system -->
     <ignore regexp="restriction_values.xml"/>
     <ignore regexp="ui/android/java/res/drawable-hdpi/verify_checkmark.png"/>
-    <!-- TODO(crbug.com/635567): Fix this properly. -->
-    <ignore regexp="ui/android/java/res/values/dimens.xml"/>
-    <!-- TODO(crbug.com/635567): Fix this properly. -->
-    <ignore regexp="components/autofill/android/java/res/values/dimens.xml"/>
-    <!-- TODO(crbug.com/635567): Fix this properly. -->
-    <ignore regexp="components/autofill/android/java/res/drawable/autofill_chip_inset.xml"/>
-    <!-- TODO(crbug.com/635567): Fix this properly. -->
-    <ignore regexp="components/autofill/android/java/res/layout/autofill_keyboard_accessory_icon.xml"/>
-    <!-- TODO(crbug.com/635567): Fix this properly. -->
-    <ignore regexp="components/autofill/android/java/res/layout/autofill_keyboard_accessory_item.xml"/>
-    <!-- TODO(crbug.com/635567): Fix this properly. -->
-    <ignore regexp="content/public/android/java/res/raw/empty.wav"/>
-    <!-- TODO(crbug.com/635567): Fix this properly. -->
-    <ignore regexp="content/public/android/java/res/drawable-hdpi/ic_menu_share_holo_light.png"/>
-    <!-- TODO(crbug.com/635567): Fix this properly. -->
-    <ignore regexp="content/public/android/java/res/drawable-hdpi/ic_search.png"/>
-    <!-- TODO(crbug.com/635567): Fix this properly. -->
-    <ignore regexp="content/public/android/java/res/menu/select_action_menu.xml"/>
-    <!-- TODO(crbug.com/635567): Fix this properly. -->
-    <ignore regexp="remoting/android/java/res/menu/chromoting_actionbar.xml"/>
-    <!-- TODO(crbug.com/635567): Fix this properly. -->
-    <ignore regexp="remoting/android/java/res/menu/desktop_actionbar.xml"/>
-    <!-- TODO(crbug.com/635567): Fix this properly. -->
-    <ignore regexp="remoting/android/java/res/menu/host_context_menu.xml"/>
-    <!-- TODO(crbug.com/635567): Fix this properly. -->
-    <ignore regexp="remoting/android/java/res/drawable-hdpi/*"/>
-    <!-- TODO(crbug.com/635567): Fix this properly. -->
-    <ignore regexp="content/public/android/java/res/values-v17/styles.xml"/>
-    <!-- TODO(crbug.com/635567): Fix this properly. -->
-    <ignore regexp="content/public/android/content_strings_grd.resources.zip/values/android_content_strings.xml"/>
-    <!-- TODO(crbug.com/635567): Fix this properly. -->
-    <ignore regexp="components/web_contents_delegate_android/android/java/res/drawable-hdpi/bubble.9.png"/>
-    <!-- TODO(crbug.com/635567): Fix this properly. -->
-    <ignore regexp="components/web_contents_delegate_android/android/java/res/drawable-hdpi/bubble_arrow_up.png"/>
-    <!-- TODO(crbug.com/635567): Fix this properly. -->
-    <ignore regexp="components/web_contents_delegate_android/android/java/res/drawable-hdpi/ic_warning.png"/>
-    <!-- TODO(crbug.com/635567): Fix this properly. -->
-    <ignore regexp="components/web_contents_delegate_android/android/java/res/layout/validation_message_bubble.xml"/>
-    <!-- TODO(crbug.com/635567): Fix this properly. -->
-    <ignore regexp="content/shell/android/java/res/drawable/ic_refresh.png"/>
-    <!-- TODO(crbug.com/635567): Fix this properly. -->
-    <ignore regexp="content/shell/android/java/res/drawable/progress.xml"/>
-    <!-- TODO(crbug.com/635567): Fix this properly. -->
-    <ignore regexp="content/shell/android/java/res/layout/shell_view.xml"/>
-    <!-- TODO(crbug.com/635567): Fix this properly. -->
-    <ignore regexp="content/shell/android/java/res/values/strings.xml"/>
-    <!-- TODO(crbug.com/635567): Fix this properly. -->
-    <ignore regexp="android_webview/test/shell/res/values/config.xml"/>
-    <!-- TODO(crbug.com/635567): Fix this properly. -->
-    <ignore regexp="android_webview/test/shell/res/layout/testshell_activity.xml"/>
-    <!-- TODO(crbug.com/635567): Fix this properly. -->
-    <ignore regexp="chrome/android/java/res/anim/accelerate_quart.xml"/>
-    <!-- TODO(crbug.com/635567): Fix this properly. -->
-    <ignore regexp="chrome/android/java/res/layout/accessibility_tab_switcher.xml"/>
-    <!-- TODO(crbug.com/635567): Fix this properly. -->
-    <ignore regexp="chrome/android/java/res/drawable/accessibility_tab_switcher_divider.xml"/>
-    <!-- TODO(crbug.com/635567): Fix this properly. -->
-    <ignore regexp="chrome/android/java/res/layout/accessibility_tab_switcher_list_item.xml"/>
-    <!-- TODO(crbug.com/635567): Fix this properly. -->
-    <ignore regexp="chrome/android/java/res/layout/account_chooser_dialog_item.xml"/>
-    <!-- TODO(crbug.com/635567): Fix this properly. -->
-    <ignore regexp="chrome/android/java/res/layout/account_chooser_dialog_title.xml"/>
-    <!-- TODO(crbug.com/635567): Fix this properly. -->
-    <ignore regexp="chrome/android/java/res/drawable-hdpi/account_management_no_picture.png"/>
-    <!-- TODO(crbug.com/635567): Fix this properly. -->
-    <ignore regexp="chrome/android/java/res/xml/account_management_preferences.xml"/>
-    <!-- TODO(crbug.com/635567): Fix this properly. -->
-    <ignore regexp="chrome/android/java/res/anim/activity_close_exit.xml"/>
-    <!-- TODO(crbug.com/635567): Fix this properly. -->
-    <ignore regexp="chrome/android/java/res/anim/activity_open_enter.xml"/>
-    <!-- TODO(crbug.com/635567): Fix this properly. -->
-    <ignore regexp="chrome/android/chrome_strings_grd.resources.zip/values/android_chrome_strings.xml"/>
-    <!-- TODO(crbug.com/635567): Fix this properly. -->
-    <ignore regexp="content/shell/android/shell_apk/res/layout/content_shell_activity.xml"/>
-    <!-- TODO(crbug.com/635567): Fix this properly. -->
-    <ignore regexp="content/shell/android/linker_test_apk/res/layout/test_activity.xml"/>
-    <!-- TODO(crbug.com/635567): Fix this properly. -->
-    <ignore regexp="content/shell/android/shell_apk/res/values/strings.xml"/>
   </issue>
   <issue id="UseCompoundDrawables">
     <ignore regexp="chrome/android/java/res/layout/download_content.xml"/>
diff --git a/build/android/pylib/constants/__init__.py b/build/android/pylib/constants/__init__.py
index 122ae98cf8ca46..9b25dcd07ca7ff 100644
--- a/build/android/pylib/constants/__init__.py
+++ b/build/android/pylib/constants/__init__.py
@@ -96,7 +96,7 @@
 SCREENSHOTS_DIR = os.path.join(DIR_SOURCE_ROOT, 'out_screenshots')
 
 ANDROID_SDK_VERSION = version_codes.MARSHMALLOW
-ANDROID_SDK_BUILD_TOOLS_VERSION = '24.0.2'
+ANDROID_SDK_BUILD_TOOLS_VERSION = '23.0.1'
 ANDROID_SDK_ROOT = os.path.join(DIR_SOURCE_ROOT,
                                 'third_party', 'android_tools', 'sdk')
 ANDROID_SDK_TOOLS = os.path.join(ANDROID_SDK_ROOT,
diff --git a/build/config/android/config.gni b/build/config/android/config.gni
index 90547cd5d0ed33..1978fa24da2744 100644
--- a/build/config/android/config.gni
+++ b/build/config/android/config.gni
@@ -35,8 +35,8 @@ if (is_android) {
 
   if (!defined(default_android_sdk_root)) {
     default_android_sdk_root = "//third_party/android_tools/sdk"
-    default_android_sdk_version = "24"
-    default_android_sdk_build_tools_version = "24.0.2"
+    default_android_sdk_version = "23"
+    default_android_sdk_build_tools_version = "23.0.1"
   }
 
   if (!defined(default_lint_android_sdk_root)) {
diff --git a/components/cronet/android/api/build.xml b/components/cronet/android/api/build.xml
index 4eb2cc6245f2b9..1f08a8263f5463 100644
--- a/components/cronet/android/api/build.xml
+++ b/components/cronet/android/api/build.xml
@@ -2,7 +2,7 @@
   <target name="doc" description="generate documentation">
       <javadoc destdir="${doc.dir}"
                overview="${overview}"
-               bootclasspath="../../../../third_party/android_tools/sdk/platforms/android-24/android.jar:../../../../third_party/android_tools/sdk/extras/android/support/annotations/android-support-annotations.jar:${lib.java.dir}/cronet_javadoc_classpath.jar"
+               bootclasspath="../../../../third_party/android_tools/sdk/platforms/android-23/android.jar:../../../../third_party/android_tools/sdk/extras/android/support/annotations/android-support-annotations.jar:${lib.java.dir}/cronet_javadoc_classpath.jar"
                docletpath="../../../../buildtools/android/doclava/jsilver.jar:../../../../buildtools/android/doclava/doclava.jar"
                >
         <fileset dir="${source.dir}">
diff --git a/components/cronet/tools/generate_javadoc.py b/components/cronet/tools/generate_javadoc.py
index 7a4b98925861e9..3914b91ed23564 100755
--- a/components/cronet/tools/generate_javadoc.py
+++ b/components/cronet/tools/generate_javadoc.py
@@ -43,15 +43,9 @@ def GenerateJavadoc(options, src_dir):
              '-Dlib.java.dir=' + lib_java_dir, '-Doverview=' + overview_file,
              'doc']
   stdout = build_utils.CheckOutput(javadoc_cmd, cwd=working_dir)
-  for line in stdout.splitlines():
-    if " error: " in line or "javadoc: error " in line:
-      build_utils.DeleteDirectory(output_dir)
-      raise build_utils.CalledProcessError(working_dir, javadoc_cmd, stdout)
-    # TODO(crbug.com/655666): remove compiler  suppression warning once fixed.
-    if ("warning" in line and not line.endswith('warnings') and
-        not "the highest major version" in line):
-      build_utils.DeleteDirectory(output_dir)
-      raise build_utils.CalledProcessError(working_dir, javadoc_cmd, stdout)
+  if " error: " in stdout or "warning" in stdout or "javadoc: error " in stdout:
+    build_utils.DeleteDirectory(output_dir)
+    raise build_utils.CalledProcessError(working_dir, javadoc_cmd, stdout)
 
 
 def main():
diff --git a/docs/android_test_instructions.md b/docs/android_test_instructions.md
index 3449a022948ccd..6524177a06f464 100644
--- a/docs/android_test_instructions.md
+++ b/docs/android_test_instructions.md
@@ -152,11 +152,11 @@ with the following commands:
 
 ```shell
 # Resize userdata partition to be 1G
-resize2fs android_emulator_sdk/sdk/system-images/android-24/x86/userdata.img 1G
+resize2fs android_emulator_sdk/sdk/system-images/android-23/x86/userdata.img 1G
 
 # Set filesystem parameter to continue on errors; Android doesn't like some
 # things e2fsprogs does.
-tune2fs -e continue android_emulator_sdk/sdk/system-images/android-24/x86/userdata.img
+tune2fs -e continue android_emulator_sdk/sdk/system-images/android-23/x86/userdata.img
 ```
 
 ## Symbolizing Crashes
diff --git a/tools/android/eclipse/.classpath b/tools/android/eclipse/.classpath
index 5197571f3b403f..520b42a4eac58e 100644
--- a/tools/android/eclipse/.classpath
+++ b/tools/android/eclipse/.classpath
@@ -212,13 +212,13 @@ to the classpath for downstream development. See "additional_entries" below.
     <classpathentry kind="src" path="out/Debug/java_proto/test_support_proto_java/src"/>
     <classpathentry kind="src" path="out/Debug/remoting_apk/gen"/>
     <classpathentry kind="lib" path="third_party/android_tools/sdk/extras/google/gcm/gcm-client/dist/gcm.jar" sourcepath="third_party/android_tools/sdk/extras/google/gcm/gcm-client/src"/>
-    <classpathentry kind="lib" path="third_party/android_tools/sdk/platforms/android-24/android.jar" sourcepath="third_party/android_tools/sdk/sources/">
+    <classpathentry kind="lib" path="third_party/android_tools/sdk/platforms/android-23/android.jar" sourcepath="third_party/android_tools/sdk/sources/">
         <attributes>
             <attribute name="javadoc_location" value="http://developer.android.com/reference/"/>
         </attributes>
     </classpathentry>
-    <classpathentry kind="lib" path="third_party/android_tools/sdk/platforms/android-24/data/layoutlib.jar" sourcepath="third_party/android_tools/sdk/sources/"/>
-    <classpathentry kind="lib" path="third_party/android_tools/sdk/platforms/android-24/uiautomator.jar" sourcepath="third_party/android_tools/sdk/sources"/>
+    <classpathentry kind="lib" path="third_party/android_tools/sdk/platforms/android-23/data/layoutlib.jar" sourcepath="third_party/android_tools/sdk/sources/"/>
+    <classpathentry kind="lib" path="third_party/android_tools/sdk/platforms/android-23/uiautomator.jar" sourcepath="third_party/android_tools/sdk/sources"/>
     <classpathentry kind="lib" path="third_party/android_tools/sdk/extras/android/support/design/libs/android-support-design.jar" sourcepath="third_party/android_tools/sdk/sources"/>
     <classpathentry kind="lib" path="third_party/android_tools/sdk/extras/android/support/v7/mediarouter/libs/android-support-v7-mediarouter.jar" sourcepath="third_party/android_tools/sdk/sources"/>
     <classpathentry kind="lib" path="third_party/android_tools/sdk/extras/android/support/v7/recyclerview/libs/android-support-v7-recyclerview.jar" sourcepath="third_party/android_tools/sdk/sources"/>