diff --git a/javadoc_combined.gradle b/javadoc_combined.gradle
index 061da9383c..aba4bf54bd 100644
--- a/javadoc_combined.gradle
+++ b/javadoc_combined.gradle
@@ -49,6 +49,12 @@ class CombinedJavadocPlugin implements Plugin<Project> {
             }
           }
           doLast {
+            libraryModules.each { libraryModule ->
+              project.copy {
+                from "${libraryModule.projectDir}/src/main/javadoc"
+                into "${project.buildDir}/docs/javadoc"
+              }
+            }
             project.fixJavadoc()
           }
         }
diff --git a/javadoc_library.gradle b/javadoc_library.gradle
index 0894cad575..a252b148c6 100644
--- a/javadoc_library.gradle
+++ b/javadoc_library.gradle
@@ -37,6 +37,10 @@ android.libraryVariants.all { variant ->
                     project.android.getBootClasspath())
         }
         doLast {
+            copy {
+                from "src/main/javadoc"
+                into "$buildDir/docs/javadoc"
+            }
             project.fixJavadoc()
         }
     }
diff --git a/javadoc_util.gradle b/javadoc_util.gradle
index 7ea69a9406..cff5f29392 100644
--- a/javadoc_util.gradle
+++ b/javadoc_util.gradle
@@ -24,7 +24,7 @@ ext.fixJavadoc = {
   def oracleRoot = "https://docs.oracle.com/javase/7/docs/api/"
   def oracleLink = "<a href=\"(${oracleRoot})(.*?)\\?is-external=true\""
   def oracleFixed = "<a href=\"\\1index.html\\?\\2\" target=\"_top\""
-  ant.replaceregexp(atch:oracleLink, replace:oracleFixed, flags:'g') {
+  ant.replaceregexp(match:oracleLink, replace:oracleFixed, flags:'g') {
     fileset(dir: "${javadocPath}", includes: "**/*.html")
   }
   // Remove date metadata that changes every time Javadoc is generated.