diff --git a/Android.bp b/Android.bp
index e3d8c85..8e8fbe9 100644
--- a/Android.bp
+++ b/Android.bp
@@ -288,12 +288,16 @@
     },
 }
 
-subdirs = [
-    "lib",
-    "soong",
-    "utils/TableGen",
-    "tools/clang-check",
-    "tools/clang-format",
-    "tools/driver",
-    "tools/libclang",
-]
+genrule {
+    name: "renderscript-clang-include",
+    visibility: ["//development/build"],
+    tools: ["soong_zip"],
+    cmd: "$(location soong_zip) -o $(out) -P renderscript/clang-include " +
+        "-C $$(dirname $(location LICENSE.TXT))/lib/Headers -D $$(dirname $(location LICENSE.TXT))/lib/Headers " +
+        "-C $$(dirname $(location LICENSE.TXT)) -f $(location LICENSE.TXT)",
+    srcs: [
+        "lib/Headers/**/*",
+        "LICENSE.TXT",
+    ],
+    out: ["clang-include.zip"],
+}