diff --git a/Android.bp b/Android.bp
index fe426e779561d..b4e02c0a092f7 100644
--- a/Android.bp
+++ b/Android.bp
@@ -612,8 +612,6 @@ stubs_defaults {
 }
 
 build = [
-    "StubLibraries.bp",
-    "ApiDocs.bp",
     "ProtoLibraries.bp",
     "TestProtoLibraries.bp",
 ]
diff --git a/api/Android.bp b/api/Android.bp
index 9d20eca75f8f7..f40f0c990f72b 100644
--- a/api/Android.bp
+++ b/api/Android.bp
@@ -252,3 +252,8 @@ java_genrule {
     out: ["api_fingerprint.txt"],
     cmd: "cat $(in) | md5sum | cut -d' ' -f1 > $(out)",
 }
+
+build = [
+    "ApiDocs.bp",
+    "StubLibraries.bp",
+]
diff --git a/ApiDocs.bp b/api/ApiDocs.bp
similarity index 100%
rename from ApiDocs.bp
rename to api/ApiDocs.bp
diff --git a/StubLibraries.bp b/api/StubLibraries.bp
similarity index 100%
rename from StubLibraries.bp
rename to api/StubLibraries.bp
diff --git a/api/docs b/api/docs
new file mode 120000
index 0000000000000..a9594bfe4ab69
--- /dev/null
+++ b/api/docs
@@ -0,0 +1 @@
+../docs
\ No newline at end of file