diff --git a/Android.bp b/Android.bp
index 14cecf8..bc142da 100644
--- a/Android.bp
+++ b/Android.bp
@@ -61,42 +61,45 @@
     },
     srcs: [
         "src/hb-aat-layout.cc",
+        "src/hb-aat-map.cc",
         "src/hb-blob.cc",
         "src/hb-buffer-serialize.cc",
         "src/hb-buffer.cc",
         "src/hb-common.cc",
         "src/hb-face.cc",
         "src/hb-font.cc",
-        "src/hb-ot-tag.cc",
-        "src/hb-set.cc",
-        "src/hb-shape.cc",
-        "src/hb-shape-plan.cc",
-        "src/hb-shaper.cc",
-        "src/hb-static.cc",
-        "src/hb-unicode.cc",
-        "src/hb-warning.cc",
+        "src/hb-icu.cc",
+        "src/hb-ot-cff1-table.cc",
+        "src/hb-ot-cff2-table.cc",
         "src/hb-ot-face.cc",
         "src/hb-ot-font.cc",
         "src/hb-ot-layout.cc",
         "src/hb-ot-map.cc",
         "src/hb-ot-math.cc",
-        "src/hb-ot-shape.cc",
         "src/hb-ot-shape-complex-arabic.cc",
         "src/hb-ot-shape-complex-default.cc",
         "src/hb-ot-shape-complex-hangul.cc",
         "src/hb-ot-shape-complex-hebrew.cc",
-        "src/hb-ot-shape-complex-indic.cc",
         "src/hb-ot-shape-complex-indic-table.cc",
+        "src/hb-ot-shape-complex-indic.cc",
         "src/hb-ot-shape-complex-khmer.cc",
         "src/hb-ot-shape-complex-myanmar.cc",
         "src/hb-ot-shape-complex-thai.cc",
-        "src/hb-ot-shape-complex-use.cc",
         "src/hb-ot-shape-complex-use-table.cc",
-        "src/hb-ot-shape-normalize.cc",
+        "src/hb-ot-shape-complex-use.cc",
+        "src/hb-ot-shape-complex-vowel-constraints.cc",
         "src/hb-ot-shape-fallback.cc",
+        "src/hb-ot-shape-normalize.cc",
+        "src/hb-ot-shape.cc",
+        "src/hb-ot-tag.cc",
         "src/hb-ot-var.cc",
-
-        "src/hb-icu.cc",
+        "src/hb-set.cc",
+        "src/hb-shape-plan.cc",
+        "src/hb-shape.cc",
+        "src/hb-shaper.cc",
+        "src/hb-static.cc",
+        "src/hb-unicode.cc",
+        "src/hb-warning.cc",
     ],
 
     target: {
diff --git a/README.version b/README.version
index 1781d25..787f6dd 100644
--- a/README.version
+++ b/README.version
@@ -1,3 +1,3 @@
-URL: https://github.com/harfbuzz/harfbuzz/commit/0a3b7a0fb0734a66926dfda5d95d3cacea8890ce
-Version: 2.0.2
+URL: https://github.com/harfbuzz/harfbuzz/commit/4941e95f10fe0fe658752134a42b58896fb19c42
+Version: 2.3.0
 BugComponent: 25699