Merge "Merge Android 12"
diff --git a/Android.bp b/Android.bp
index d5ebda1..d69ed2b 100644
--- a/Android.bp
+++ b/Android.bp
@@ -147,6 +147,13 @@
         "src/hb-static.cc",
         "src/hb-ucd.cc",
         "src/hb-unicode.cc",
+        "src/hb-subset-cff-common.cc",
+        "src/hb-subset-cff1.cc",
+        "src/hb-subset-cff2.cc",
+        "src/hb-subset-input.cc",
+        "src/hb-subset-plan.cc",
+        "src/hb-subset.cc",
+        "src/hb-map.cc",
     ],
 
     target: {