diff --git a/tools/checkstyle/android-style.xml b/tools/checkstyle/android-style.xml
index 2a983986a..a6139d405 100644
--- a/tools/checkstyle/android-style.xml
+++ b/tools/checkstyle/android-style.xml
@@ -1,247 +1,31 @@
-
+
+
+
+
+
+]>
-
-
-
-
-
-
-
-
-
-
-
+ &defaultModuleChecks;
+ &defaultCopyrightCheck;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ &defaultJavadocChecks;
+ &defaultTreewalkerChecks;
diff --git a/tools/checkstyle/default-copyright-check.xml b/tools/checkstyle/default-copyright-check.xml
new file mode 100644
index 000000000..e36f1c7ad
--- /dev/null
+++ b/tools/checkstyle/default-copyright-check.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
diff --git a/tools/checkstyle/default-javadoc-checks.xml b/tools/checkstyle/default-javadoc-checks.xml
new file mode 100644
index 000000000..b17f2c638
--- /dev/null
+++ b/tools/checkstyle/default-javadoc-checks.xml
@@ -0,0 +1,32 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tools/checkstyle/default-module-checks.xml b/tools/checkstyle/default-module-checks.xml
new file mode 100644
index 000000000..246e89aa3
--- /dev/null
+++ b/tools/checkstyle/default-module-checks.xml
@@ -0,0 +1,38 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tools/checkstyle/default-treewalker-checks.xml b/tools/checkstyle/default-treewalker-checks.xml
new file mode 100644
index 000000000..283e770b0
--- /dev/null
+++ b/tools/checkstyle/default-treewalker-checks.xml
@@ -0,0 +1,212 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+