diff --git a/data/fonts/fallback_fonts.xml b/data/fonts/fallback_fonts.xml
deleted file mode 100644
index 55c000c62f4a6..0000000000000
--- a/data/fonts/fallback_fonts.xml
+++ /dev/null
@@ -1,467 +0,0 @@
-
-
-
-
-
- NotoNaskhArabic-Regular.ttf
- NotoNaskhArabic-Bold.ttf
-
-
-
-
- NotoNaskhArabicUI-Regular.ttf
- NotoNaskhArabicUI-Bold.ttf
-
-
-
-
- NotoSansEthiopic-Regular.ttf
- NotoSansEthiopic-Bold.ttf
-
-
-
-
- NotoSansHebrew-Regular.ttf
- NotoSansHebrew-Bold.ttf
-
-
-
-
- NotoSansThai-Regular.ttf
- NotoSansThai-Bold.ttf
-
-
-
-
- NotoSansThaiUI-Regular.ttf
- NotoSansThaiUI-Bold.ttf
-
-
-
-
- NotoSansArmenian-Regular.ttf
- NotoSansArmenian-Bold.ttf
-
-
-
-
- NotoSansGeorgian-Regular.ttf
- NotoSansGeorgian-Bold.ttf
-
-
-
-
- NotoSansDevanagari-Regular.ttf
- NotoSansDevanagari-Bold.ttf
-
-
-
-
- NotoSansDevanagariUI-Regular.ttf
- NotoSansDevanagariUI-Bold.ttf
-
-
-
-
-
- NotoSansGujarati-Regular.ttf
- NotoSansGujarati-Bold.ttf
-
-
-
-
- NotoSansGujaratiUI-Regular.ttf
- NotoSansGujaratiUI-Bold.ttf
-
-
-
-
-
- NotoSansGurmukhi-Regular.ttf
- NotoSansGurmukhi-Bold.ttf
-
-
-
-
- NotoSansGurmukhiUI-Regular.ttf
- NotoSansGurmukhiUI-Bold.ttf
-
-
-
-
- NotoSansTamil-Regular.ttf
- NotoSansTamil-Bold.ttf
-
-
-
-
- NotoSansTamilUI-Regular.ttf
- NotoSansTamilUI-Bold.ttf
-
-
-
-
- NotoSansMalayalam-Regular.ttf
- NotoSansMalayalam-Bold.ttf
-
-
-
-
- NotoSansMalayalamUI-Regular.ttf
- NotoSansMalayalamUI-Bold.ttf
-
-
-
-
- NotoSansBengali-Regular.ttf
- NotoSansBengali-Bold.ttf
-
-
-
-
- NotoSansBengaliUI-Regular.ttf
- NotoSansBengaliUI-Bold.ttf
-
-
-
-
- NotoSansTelugu-Regular.ttf
- NotoSansTelugu-Bold.ttf
-
-
-
-
- NotoSansTeluguUI-Regular.ttf
- NotoSansTeluguUI-Bold.ttf
-
-
-
-
- NotoSansKannada-Regular.ttf
- NotoSansKannada-Bold.ttf
-
-
-
-
- NotoSansKannadaUI-Regular.ttf
- NotoSansKannadaUI-Bold.ttf
-
-
-
-
- NotoSansOriya-Regular.ttf
- NotoSansOriya-Bold.ttf
-
-
-
-
- NotoSansOriyaUI-Regular.ttf
- NotoSansOriyaUI-Bold.ttf
-
-
-
-
- NotoSansSinhala-Regular.ttf
- NotoSansSinhala-Bold.ttf
-
-
-
-
- NotoSansKhmer-Regular.ttf
- NotoSansKhmer-Bold.ttf
-
-
-
-
- NotoSansKhmerUI-Regular.ttf
- NotoSansKhmerUI-Bold.ttf
-
-
-
-
- NotoSansLao-Regular.ttf
- NotoSansLao-Bold.ttf
-
-
-
-
- NotoSansLaoUI-Regular.ttf
- NotoSansLaoUI-Bold.ttf
-
-
-
-
- NotoSansMyanmar-Regular.ttf
- NotoSansMyanmar-Bold.ttf
-
-
-
-
- NotoSansMyanmarUI-Regular.ttf
- NotoSansMyanmarUI-Bold.ttf
-
-
-
-
- NotoSansThaana-Regular.ttf
- NotoSansThaana-Bold.ttf
-
-
-
-
- NotoSansCham-Regular.ttf
- NotoSansCham-Bold.ttf
-
-
-
-
- NotoSansBalinese-Regular.ttf
-
-
-
-
- NotoSansBamum-Regular.ttf
-
-
-
-
- NotoSansBatak-Regular.ttf
-
-
-
-
- NotoSansBuginese-Regular.ttf
-
-
-
-
- NotoSansBuhid-Regular.ttf
-
-
-
-
- NotoSansCanadianAboriginal-Regular.ttf
-
-
-
-
- NotoSansCherokee-Regular.ttf
-
-
-
-
- NotoSansCoptic-Regular.ttf
-
-
-
-
- NotoSansGlagolitic-Regular.ttf
-
-
-
-
- NotoSansHanunoo-Regular.ttf
-
-
-
-
- NotoSansJavanese-Regular.ttf
-
-
-
-
- NotoSansKayahLi-Regular.ttf
-
-
-
-
- NotoSansLepcha-Regular.ttf
-
-
-
-
- NotoSansLimbu-Regular.ttf
-
-
-
-
- NotoSansLisu-Regular.ttf
-
-
-
-
- NotoSansMandaic-Regular.ttf
-
-
-
-
- NotoSansMeeteiMayek-Regular.ttf
-
-
-
-
- NotoSansNewTaiLue-Regular.ttf
-
-
-
-
- NotoSansNKo-Regular.ttf
-
-
-
-
- NotoSansOlChiki-Regular.ttf
-
-
-
-
- NotoSansRejang-Regular.ttf
-
-
-
-
- NotoSansSaurashtra-Regular.ttf
-
-
-
-
- NotoSansSundanese-Regular.ttf
-
-
-
-
- NotoSansSylotiNagri-Regular.ttf
-
-
-
-
- NotoSansSyriacEstrangela-Regular.ttf
-
-
-
-
- NotoSansTagbanwa-Regular.ttf
-
-
-
-
- NotoSansTaiTham-Regular.ttf
-
-
-
-
- NotoSansTaiViet-Regular.ttf
-
-
-
-
- NotoSansTibetan-Regular.ttf
-
-
-
-
- NotoSansTifinagh-Regular.ttf
-
-
-
-
- NotoSansVai-Regular.ttf
-
-
-
-
- NotoSansYi-Regular.ttf
-
-
-
-
- NotoSansSymbols-Regular-Subsetted.ttf
-
-
-
-
- NotoSansSC-Regular.otf
-
-
-
-
- NotoSansTC-Regular.otf
-
-
-
-
- NotoSansJP-Regular.otf
-
-
-
-
- NotoSansKR-Regular.otf
-
-
-
-
- NanumGothic.ttf
-
-
-
-
- NotoColorEmoji.ttf
-
-
-
-
- DroidSansFallback.ttf
-
-
-
-
- MTLmr3m.ttf
-
-
-
-
-
- NotoSansTaiLe-Regular.ttf
-
-
-
-
- NotoSansMongolian-Regular.ttf
-
-
-
diff --git a/data/fonts/fonts.mk b/data/fonts/fonts.mk
index a5939fa607f4d..597a12245c119 100644
--- a/data/fonts/fonts.mk
+++ b/data/fonts/fonts.mk
@@ -15,8 +15,6 @@
# Warning: this is actually a product definition, to be inherited from
PRODUCT_COPY_FILES := \
- frameworks/base/data/fonts/system_fonts.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/system_fonts.xml \
- frameworks/base/data/fonts/fallback_fonts.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/fallback_fonts.xml \
frameworks/base/data/fonts/fonts.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/fonts.xml
PRODUCT_PACKAGES := \
diff --git a/data/fonts/fonts.xml b/data/fonts/fonts.xml
index dbe81fa55f6e8..1b97b658943c2 100644
--- a/data/fonts/fonts.xml
+++ b/data/fonts/fonts.xml
@@ -1,11 +1,6 @@
-
-
-
-
- sans-serif
- arial
- helvetica
- tahoma
- verdana
-
-
- Roboto-Regular.ttf
- Roboto-Bold.ttf
- Roboto-Italic.ttf
- Roboto-BoldItalic.ttf
-
-
-
-
-
- sans-serif-light
-
-
- Roboto-Light.ttf
- Roboto-LightItalic.ttf
-
-
-
-
-
- sans-serif-thin
-
-
- Roboto-Thin.ttf
- Roboto-ThinItalic.ttf
-
-
-
-
-
- sans-serif-condensed
-
-
- RobotoCondensed-Regular.ttf
- RobotoCondensed-Bold.ttf
- RobotoCondensed-Italic.ttf
- RobotoCondensed-BoldItalic.ttf
-
-
-
-
-
- sans-serif-medium
-
-
- Roboto-Medium.ttf
- Roboto-MediumItalic.ttf
-
-
-
-
-
- sans-serif-black
-
-
- Roboto-Black.ttf
- Roboto-BlackItalic.ttf
-
-
-
-
-
- sans-serif-condensed-light
-
-
- RobotoCondensed-Light.ttf
- RobotoCondensed-LightItalic.ttf
-
-
-
-
-
- serif
- times
- times new roman
- palatino
- georgia
- baskerville
- goudy
- fantasy
- ITC Stone Serif
-
-
- NotoSerif-Regular.ttf
- NotoSerif-Bold.ttf
- NotoSerif-Italic.ttf
- NotoSerif-BoldItalic.ttf
-
-
-
-
-
- Droid Sans
-
-
- DroidSans.ttf
- DroidSans-Bold.ttf
-
-
-
-
-
- monospace
- sans-serif-monospace
- monaco
-
-
- DroidSansMono.ttf
-
-
-
-
-
- serif-monospace
- courier
- courier new
-
-
- CutiveMono.ttf
-
-
-
-
-
- casual
-
-
- ComingSoon.ttf
-
-
-
-
-
- cursive
-
-
- DancingScript-Regular.ttf
- DancingScript-Bold.ttf
-
-
-
-
-
- sans-serif-smallcaps
-
-
- CarroisGothicSC-Regular.ttf
-
-
-
-
diff --git a/data/fonts/vendor_fonts.xml b/data/fonts/vendor_fonts.xml
deleted file mode 100644
index 8690ee1af5c76..0000000000000
--- a/data/fonts/vendor_fonts.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-
-
-
-
-