diff --git a/Android.mk b/Android.mk
index ec03c66..1f71f83 100644
--- a/Android.mk
+++ b/Android.mk
@@ -143,6 +143,7 @@
     NotoSansTaiViet-Regular.ttf \
     NotoSansThaana-Regular.ttf \
     NotoSansThaana-Bold.ttf \
+    NotoSansTibetan-Regular.ttf \
     NotoSansTifinagh-Regular.ttf \
     NotoSansVai-Regular.ttf \
     NotoSansYi-Regular.ttf
@@ -202,10 +203,10 @@
 #############################################################################
 ifneq ($(MINIMAL_FONT_FOOTPRINT),true)
 font_src_files += \
-    NotoNaskh-Regular.ttf \
-    NotoNaskh-Bold.ttf \
-    NotoNaskhUI-Regular.ttf \
-    NotoNaskhUI-Bold.ttf \
+    NotoNaskhArabic-Regular.ttf \
+    NotoNaskhArabic-Bold.ttf \
+    NotoNaskhArabicUI-Regular.ttf \
+    NotoNaskhArabicUI-Bold.ttf \
     NotoSansArmenian-Regular.ttf \
     NotoSansArmenian-Bold.ttf \
     NotoSansGeorgian-Regular.ttf \
diff --git a/fonts.mk b/fonts.mk
index 7375a87..bd0efb8 100644
--- a/fonts.mk
+++ b/fonts.mk
@@ -18,10 +18,10 @@
 
 PRODUCT_PACKAGES := \
     NotoColorEmoji.ttf \
-    NotoNaskh-Regular.ttf \
-    NotoNaskh-Bold.ttf \
-    NotoNaskhUI-Regular.ttf \
-    NotoNaskhUI-Bold.ttf \
+    NotoNaskhArabic-Regular.ttf \
+    NotoNaskhArabic-Bold.ttf \
+    NotoNaskhArabicUI-Regular.ttf \
+    NotoNaskhArabicUI-Bold.ttf \
     NotoSansArmenian-Regular.ttf \
     NotoSansArmenian-Bold.ttf \
     NotoSansBalinese-Regular.ttf \
@@ -123,6 +123,7 @@
     NotoSansThai-Bold.ttf \
     NotoSansThaiUI-Regular.ttf \
     NotoSansThaiUI-Bold.ttf \
+    NotoSansTibetan-Regular.ttf \
     NotoSansTifinagh-Regular.ttf \
     NotoSansVai-Regular.ttf \
     NotoSansYi-Regular.ttf \
diff --git a/other/NotoKufiArabic-Bold.ttf b/other/NotoKufiArabic-Bold.ttf
new file mode 100644
index 0000000..ee78b2f
--- /dev/null
+++ b/other/NotoKufiArabic-Bold.ttf
Binary files differ
diff --git a/other/NotoKufiArabic-Regular.ttf b/other/NotoKufiArabic-Regular.ttf
new file mode 100644
index 0000000..fc6da3d
--- /dev/null
+++ b/other/NotoKufiArabic-Regular.ttf
Binary files differ
diff --git a/other/NotoNaskh-Bold.ttf b/other/NotoNaskh-Bold.ttf
deleted file mode 100644
index 00a5fdc..0000000
--- a/other/NotoNaskh-Bold.ttf
+++ /dev/null
Binary files differ
diff --git a/other/NotoNaskh-Regular.ttf b/other/NotoNaskh-Regular.ttf
deleted file mode 100644
index eaba984..0000000
--- a/other/NotoNaskh-Regular.ttf
+++ /dev/null
Binary files differ
diff --git a/other/NotoNaskhArabic-Bold.ttf b/other/NotoNaskhArabic-Bold.ttf
new file mode 100644
index 0000000..9428e5c
--- /dev/null
+++ b/other/NotoNaskhArabic-Bold.ttf
Binary files differ
diff --git a/other/NotoNaskhArabic-Regular.ttf b/other/NotoNaskhArabic-Regular.ttf
new file mode 100644
index 0000000..5000b62
--- /dev/null
+++ b/other/NotoNaskhArabic-Regular.ttf
Binary files differ
diff --git a/other/NotoNaskhArabicUI-Bold.ttf b/other/NotoNaskhArabicUI-Bold.ttf
new file mode 100644
index 0000000..3abebe1
--- /dev/null
+++ b/other/NotoNaskhArabicUI-Bold.ttf
Binary files differ
diff --git a/other/NotoNaskhArabicUI-Regular.ttf b/other/NotoNaskhArabicUI-Regular.ttf
new file mode 100644
index 0000000..b7e8681
--- /dev/null
+++ b/other/NotoNaskhArabicUI-Regular.ttf
Binary files differ
diff --git a/other/NotoNaskhUI-Bold.ttf b/other/NotoNaskhUI-Bold.ttf
deleted file mode 100644
index 95df42c..0000000
--- a/other/NotoNaskhUI-Bold.ttf
+++ /dev/null
Binary files differ
diff --git a/other/NotoNaskhUI-Regular.ttf b/other/NotoNaskhUI-Regular.ttf
deleted file mode 100644
index 85a9eff..0000000
--- a/other/NotoNaskhUI-Regular.ttf
+++ /dev/null
Binary files differ
diff --git a/other/NotoSans-Bold.ttf b/other/NotoSans-Bold.ttf
new file mode 100644
index 0000000..58f6707
--- /dev/null
+++ b/other/NotoSans-Bold.ttf
Binary files differ
diff --git a/other/NotoSans-BoldItalic.ttf b/other/NotoSans-BoldItalic.ttf
new file mode 100644
index 0000000..9f5837f
--- /dev/null
+++ b/other/NotoSans-BoldItalic.ttf
Binary files differ
diff --git a/other/NotoSans-Italic.ttf b/other/NotoSans-Italic.ttf
new file mode 100644
index 0000000..ae11927
--- /dev/null
+++ b/other/NotoSans-Italic.ttf
Binary files differ
diff --git a/other/NotoSans-Regular.ttf b/other/NotoSans-Regular.ttf
new file mode 100644
index 0000000..82c0505
--- /dev/null
+++ b/other/NotoSans-Regular.ttf
Binary files differ
diff --git a/other/NotoSansArmenian-Bold.ttf b/other/NotoSansArmenian-Bold.ttf
index cc85598..0b23ddd 100644
--- a/other/NotoSansArmenian-Bold.ttf
+++ b/other/NotoSansArmenian-Bold.ttf
Binary files differ
diff --git a/other/NotoSansArmenian-Regular.ttf b/other/NotoSansArmenian-Regular.ttf
index 67f96a5..174b7df 100644
--- a/other/NotoSansArmenian-Regular.ttf
+++ b/other/NotoSansArmenian-Regular.ttf
Binary files differ
diff --git a/other/NotoSansAvestan-Regular.ttf b/other/NotoSansAvestan-Regular.ttf
new file mode 100644
index 0000000..1e65e3e
--- /dev/null
+++ b/other/NotoSansAvestan-Regular.ttf
Binary files differ
diff --git a/other/NotoSansBalinese-Regular.ttf b/other/NotoSansBalinese-Regular.ttf
index 5298392..cc28672 100644
--- a/other/NotoSansBalinese-Regular.ttf
+++ b/other/NotoSansBalinese-Regular.ttf
Binary files differ
diff --git a/other/NotoSansBamum-Regular.ttf b/other/NotoSansBamum-Regular.ttf
index d5a83b4..5b7f399 100644
--- a/other/NotoSansBamum-Regular.ttf
+++ b/other/NotoSansBamum-Regular.ttf
Binary files differ
diff --git a/other/NotoSansBatak-Regular.ttf b/other/NotoSansBatak-Regular.ttf
index bb2ab92..d83f608 100644
--- a/other/NotoSansBatak-Regular.ttf
+++ b/other/NotoSansBatak-Regular.ttf
Binary files differ
diff --git a/other/NotoSansBengali-Bold.ttf b/other/NotoSansBengali-Bold.ttf
index 5c894bd..0377cb9 100644
--- a/other/NotoSansBengali-Bold.ttf
+++ b/other/NotoSansBengali-Bold.ttf
Binary files differ
diff --git a/other/NotoSansBengali-Regular.ttf b/other/NotoSansBengali-Regular.ttf
index 504f0e9..6c4a0dd 100644
--- a/other/NotoSansBengali-Regular.ttf
+++ b/other/NotoSansBengali-Regular.ttf
Binary files differ
diff --git a/other/NotoSansBengaliUI-Bold.ttf b/other/NotoSansBengaliUI-Bold.ttf
index b07ae01..2f30f74 100644
--- a/other/NotoSansBengaliUI-Bold.ttf
+++ b/other/NotoSansBengaliUI-Bold.ttf
Binary files differ
diff --git a/other/NotoSansBengaliUI-Regular.ttf b/other/NotoSansBengaliUI-Regular.ttf
index b45d6de..5d58f89 100644
--- a/other/NotoSansBengaliUI-Regular.ttf
+++ b/other/NotoSansBengaliUI-Regular.ttf
Binary files differ
diff --git a/other/NotoSansBrahmi-Regular.ttf b/other/NotoSansBrahmi-Regular.ttf
new file mode 100644
index 0000000..2194d0a
--- /dev/null
+++ b/other/NotoSansBrahmi-Regular.ttf
Binary files differ
diff --git a/other/NotoSansBuginese-Regular.ttf b/other/NotoSansBuginese-Regular.ttf
index dba9783..105a19d 100644
--- a/other/NotoSansBuginese-Regular.ttf
+++ b/other/NotoSansBuginese-Regular.ttf
Binary files differ
diff --git a/other/NotoSansBuhid-Regular.ttf b/other/NotoSansBuhid-Regular.ttf
index 84b656a..1a608dc 100644
--- a/other/NotoSansBuhid-Regular.ttf
+++ b/other/NotoSansBuhid-Regular.ttf
Binary files differ
diff --git a/other/NotoSansCanadianAboriginal-Regular.ttf b/other/NotoSansCanadianAboriginal-Regular.ttf
index 9628f56..e6435a8 100644
--- a/other/NotoSansCanadianAboriginal-Regular.ttf
+++ b/other/NotoSansCanadianAboriginal-Regular.ttf
Binary files differ
diff --git a/other/NotoSansCarian-Regular.ttf b/other/NotoSansCarian-Regular.ttf
new file mode 100644
index 0000000..6b34fd4
--- /dev/null
+++ b/other/NotoSansCarian-Regular.ttf
Binary files differ
diff --git a/other/NotoSansCham-Bold.ttf b/other/NotoSansCham-Bold.ttf
index a71469c..27d71b9 100644
--- a/other/NotoSansCham-Bold.ttf
+++ b/other/NotoSansCham-Bold.ttf
Binary files differ
diff --git a/other/NotoSansCham-Regular.ttf b/other/NotoSansCham-Regular.ttf
index 937606d..5a3a57a 100644
--- a/other/NotoSansCham-Regular.ttf
+++ b/other/NotoSansCham-Regular.ttf
Binary files differ
diff --git a/other/NotoSansCherokee-Regular.ttf b/other/NotoSansCherokee-Regular.ttf
index 1f28fa7..d004b1f 100644
--- a/other/NotoSansCherokee-Regular.ttf
+++ b/other/NotoSansCherokee-Regular.ttf
Binary files differ
diff --git a/other/NotoSansCoptic-Regular.ttf b/other/NotoSansCoptic-Regular.ttf
index f47a40c..8ce27a5 100644
--- a/other/NotoSansCoptic-Regular.ttf
+++ b/other/NotoSansCoptic-Regular.ttf
Binary files differ
diff --git a/other/NotoSansCuneiform-Regular.ttf b/other/NotoSansCuneiform-Regular.ttf
new file mode 100644
index 0000000..fd11240
--- /dev/null
+++ b/other/NotoSansCuneiform-Regular.ttf
Binary files differ
diff --git a/other/NotoSansCypriot-Regular.ttf b/other/NotoSansCypriot-Regular.ttf
new file mode 100644
index 0000000..36ee732
--- /dev/null
+++ b/other/NotoSansCypriot-Regular.ttf
Binary files differ
diff --git a/other/NotoSansDeseret-Regular.ttf b/other/NotoSansDeseret-Regular.ttf
new file mode 100644
index 0000000..760a1e9
--- /dev/null
+++ b/other/NotoSansDeseret-Regular.ttf
Binary files differ
diff --git a/other/NotoSansDevanagari-Bold.ttf b/other/NotoSansDevanagari-Bold.ttf
index 3862ae8..0c352ce 100644
--- a/other/NotoSansDevanagari-Bold.ttf
+++ b/other/NotoSansDevanagari-Bold.ttf
Binary files differ
diff --git a/other/NotoSansDevanagari-Regular.ttf b/other/NotoSansDevanagari-Regular.ttf
index 51182c5..27f2d9e 100644
--- a/other/NotoSansDevanagari-Regular.ttf
+++ b/other/NotoSansDevanagari-Regular.ttf
Binary files differ
diff --git a/other/NotoSansDevanagariUI-Bold.ttf b/other/NotoSansDevanagariUI-Bold.ttf
index 6546bd0..06b00e9 100644
--- a/other/NotoSansDevanagariUI-Bold.ttf
+++ b/other/NotoSansDevanagariUI-Bold.ttf
Binary files differ
diff --git a/other/NotoSansDevanagariUI-Regular.ttf b/other/NotoSansDevanagariUI-Regular.ttf
index 703ac14..bb6383c 100644
--- a/other/NotoSansDevanagariUI-Regular.ttf
+++ b/other/NotoSansDevanagariUI-Regular.ttf
Binary files differ
diff --git a/other/NotoSansEgyptianHieroglyphs-Regular.ttf b/other/NotoSansEgyptianHieroglyphs-Regular.ttf
new file mode 100644
index 0000000..56cf414
--- /dev/null
+++ b/other/NotoSansEgyptianHieroglyphs-Regular.ttf
Binary files differ
diff --git a/other/NotoSansEthiopic-Bold.ttf b/other/NotoSansEthiopic-Bold.ttf
index 1017302..8093bff 100644
--- a/other/NotoSansEthiopic-Bold.ttf
+++ b/other/NotoSansEthiopic-Bold.ttf
Binary files differ
diff --git a/other/NotoSansEthiopic-Regular.ttf b/other/NotoSansEthiopic-Regular.ttf
index 83f09a8..75f6ee0 100644
--- a/other/NotoSansEthiopic-Regular.ttf
+++ b/other/NotoSansEthiopic-Regular.ttf
Binary files differ
diff --git a/other/NotoSansGeorgian-Bold.ttf b/other/NotoSansGeorgian-Bold.ttf
index 80b9324..ff3ca66 100644
--- a/other/NotoSansGeorgian-Bold.ttf
+++ b/other/NotoSansGeorgian-Bold.ttf
Binary files differ
diff --git a/other/NotoSansGeorgian-Regular.ttf b/other/NotoSansGeorgian-Regular.ttf
index 98e102b..ddcca9f 100644
--- a/other/NotoSansGeorgian-Regular.ttf
+++ b/other/NotoSansGeorgian-Regular.ttf
Binary files differ
diff --git a/other/NotoSansGlagolitic-Regular.ttf b/other/NotoSansGlagolitic-Regular.ttf
index d85b301..a75222e 100644
--- a/other/NotoSansGlagolitic-Regular.ttf
+++ b/other/NotoSansGlagolitic-Regular.ttf
Binary files differ
diff --git a/other/NotoSansGothic-Regular.ttf b/other/NotoSansGothic-Regular.ttf
new file mode 100644
index 0000000..7e3cb5e
--- /dev/null
+++ b/other/NotoSansGothic-Regular.ttf
Binary files differ
diff --git a/other/NotoSansGujarati-Bold.ttf b/other/NotoSansGujarati-Bold.ttf
index 8413835..08a1073 100644
--- a/other/NotoSansGujarati-Bold.ttf
+++ b/other/NotoSansGujarati-Bold.ttf
Binary files differ
diff --git a/other/NotoSansGujarati-Regular.ttf b/other/NotoSansGujarati-Regular.ttf
index e7f1d31..253a49e 100644
--- a/other/NotoSansGujarati-Regular.ttf
+++ b/other/NotoSansGujarati-Regular.ttf
Binary files differ
diff --git a/other/NotoSansGujaratiUI-Bold.ttf b/other/NotoSansGujaratiUI-Bold.ttf
index a1f63be..a7148b5 100644
--- a/other/NotoSansGujaratiUI-Bold.ttf
+++ b/other/NotoSansGujaratiUI-Bold.ttf
Binary files differ
diff --git a/other/NotoSansGujaratiUI-Regular.ttf b/other/NotoSansGujaratiUI-Regular.ttf
index e69c125..0354db9 100644
--- a/other/NotoSansGujaratiUI-Regular.ttf
+++ b/other/NotoSansGujaratiUI-Regular.ttf
Binary files differ
diff --git a/other/NotoSansGurmukhi-Bold.ttf b/other/NotoSansGurmukhi-Bold.ttf
index d1727a2..fd8ca67 100644
--- a/other/NotoSansGurmukhi-Bold.ttf
+++ b/other/NotoSansGurmukhi-Bold.ttf
Binary files differ
diff --git a/other/NotoSansGurmukhi-Regular.ttf b/other/NotoSansGurmukhi-Regular.ttf
index 4dd589c..6eaced6 100644
--- a/other/NotoSansGurmukhi-Regular.ttf
+++ b/other/NotoSansGurmukhi-Regular.ttf
Binary files differ
diff --git a/other/NotoSansGurmukhiUI-Bold.ttf b/other/NotoSansGurmukhiUI-Bold.ttf
index a0f157d..da29e38 100644
--- a/other/NotoSansGurmukhiUI-Bold.ttf
+++ b/other/NotoSansGurmukhiUI-Bold.ttf
Binary files differ
diff --git a/other/NotoSansGurmukhiUI-Regular.ttf b/other/NotoSansGurmukhiUI-Regular.ttf
index d7483b9..8b8138a 100644
--- a/other/NotoSansGurmukhiUI-Regular.ttf
+++ b/other/NotoSansGurmukhiUI-Regular.ttf
Binary files differ
diff --git a/other/NotoSansHanunoo-Regular.ttf b/other/NotoSansHanunoo-Regular.ttf
index 57a22b7..0b968bd 100644
--- a/other/NotoSansHanunoo-Regular.ttf
+++ b/other/NotoSansHanunoo-Regular.ttf
Binary files differ
diff --git a/other/NotoSansHebrew-Bold.ttf b/other/NotoSansHebrew-Bold.ttf
index 2ba5219..32f856a 100644
--- a/other/NotoSansHebrew-Bold.ttf
+++ b/other/NotoSansHebrew-Bold.ttf
Binary files differ
diff --git a/other/NotoSansHebrew-Regular.ttf b/other/NotoSansHebrew-Regular.ttf
index 49d3158..6058393 100644
--- a/other/NotoSansHebrew-Regular.ttf
+++ b/other/NotoSansHebrew-Regular.ttf
Binary files differ
diff --git a/other/NotoSansImperialAramaic-Regular.ttf b/other/NotoSansImperialAramaic-Regular.ttf
new file mode 100644
index 0000000..8efc3b6
--- /dev/null
+++ b/other/NotoSansImperialAramaic-Regular.ttf
Binary files differ
diff --git a/other/NotoSansInscriptionalPahlavi-Regular.ttf b/other/NotoSansInscriptionalPahlavi-Regular.ttf
new file mode 100644
index 0000000..b51750a
--- /dev/null
+++ b/other/NotoSansInscriptionalPahlavi-Regular.ttf
Binary files differ
diff --git a/other/NotoSansInscriptionalParthian-Regular.ttf b/other/NotoSansInscriptionalParthian-Regular.ttf
new file mode 100644
index 0000000..492398a
--- /dev/null
+++ b/other/NotoSansInscriptionalParthian-Regular.ttf
Binary files differ
diff --git a/other/NotoSansJavanese-Regular.ttf b/other/NotoSansJavanese-Regular.ttf
index 96ac014..7e89caa 100644
--- a/other/NotoSansJavanese-Regular.ttf
+++ b/other/NotoSansJavanese-Regular.ttf
Binary files differ
diff --git a/other/NotoSansKaithi-Regular.ttf b/other/NotoSansKaithi-Regular.ttf
new file mode 100644
index 0000000..5ec563a
--- /dev/null
+++ b/other/NotoSansKaithi-Regular.ttf
Binary files differ
diff --git a/other/NotoSansKannada-Bold.ttf b/other/NotoSansKannada-Bold.ttf
index 1028e5d..299b5a0 100644
--- a/other/NotoSansKannada-Bold.ttf
+++ b/other/NotoSansKannada-Bold.ttf
Binary files differ
diff --git a/other/NotoSansKannada-Regular.ttf b/other/NotoSansKannada-Regular.ttf
index 47d16e9..a991565 100644
--- a/other/NotoSansKannada-Regular.ttf
+++ b/other/NotoSansKannada-Regular.ttf
Binary files differ
diff --git a/other/NotoSansKannadaUI-Bold.ttf b/other/NotoSansKannadaUI-Bold.ttf
index 0ad0f3a..50a5aaf 100644
--- a/other/NotoSansKannadaUI-Bold.ttf
+++ b/other/NotoSansKannadaUI-Bold.ttf
Binary files differ
diff --git a/other/NotoSansKannadaUI-Regular.ttf b/other/NotoSansKannadaUI-Regular.ttf
index 4c156c0..4a86b6f 100644
--- a/other/NotoSansKannadaUI-Regular.ttf
+++ b/other/NotoSansKannadaUI-Regular.ttf
Binary files differ
diff --git a/other/NotoSansKayahLi-Regular.ttf b/other/NotoSansKayahLi-Regular.ttf
index 97f21f3..8d43a5f 100644
--- a/other/NotoSansKayahLi-Regular.ttf
+++ b/other/NotoSansKayahLi-Regular.ttf
Binary files differ
diff --git a/other/NotoSansKharoshthi-Regular.ttf b/other/NotoSansKharoshthi-Regular.ttf
new file mode 100644
index 0000000..6a32baf
--- /dev/null
+++ b/other/NotoSansKharoshthi-Regular.ttf
Binary files differ
diff --git a/other/NotoSansKhmer-Bold.ttf b/other/NotoSansKhmer-Bold.ttf
index f422ab7..10b4e2d 100644
--- a/other/NotoSansKhmer-Bold.ttf
+++ b/other/NotoSansKhmer-Bold.ttf
Binary files differ
diff --git a/other/NotoSansKhmer-Regular.ttf b/other/NotoSansKhmer-Regular.ttf
index 57289fe..6008370 100644
--- a/other/NotoSansKhmer-Regular.ttf
+++ b/other/NotoSansKhmer-Regular.ttf
Binary files differ
diff --git a/other/NotoSansKhmerUI-Bold.ttf b/other/NotoSansKhmerUI-Bold.ttf
index a9177b2..a1e0658 100644
--- a/other/NotoSansKhmerUI-Bold.ttf
+++ b/other/NotoSansKhmerUI-Bold.ttf
Binary files differ
diff --git a/other/NotoSansKhmerUI-Regular.ttf b/other/NotoSansKhmerUI-Regular.ttf
index c711240..691739e 100644
--- a/other/NotoSansKhmerUI-Regular.ttf
+++ b/other/NotoSansKhmerUI-Regular.ttf
Binary files differ
diff --git a/other/NotoSansLao-Bold.ttf b/other/NotoSansLao-Bold.ttf
index b97d74c..a526be2 100644
--- a/other/NotoSansLao-Bold.ttf
+++ b/other/NotoSansLao-Bold.ttf
Binary files differ
diff --git a/other/NotoSansLao-Regular.ttf b/other/NotoSansLao-Regular.ttf
index 71f3e2d..1d1a379 100644
--- a/other/NotoSansLao-Regular.ttf
+++ b/other/NotoSansLao-Regular.ttf
Binary files differ
diff --git a/other/NotoSansLaoUI-Bold.ttf b/other/NotoSansLaoUI-Bold.ttf
index 1761363..2b89821 100644
--- a/other/NotoSansLaoUI-Bold.ttf
+++ b/other/NotoSansLaoUI-Bold.ttf
Binary files differ
diff --git a/other/NotoSansLaoUI-Regular.ttf b/other/NotoSansLaoUI-Regular.ttf
index 101fb90..87d2258 100644
--- a/other/NotoSansLaoUI-Regular.ttf
+++ b/other/NotoSansLaoUI-Regular.ttf
Binary files differ
diff --git a/other/NotoSansLepcha-Regular.ttf b/other/NotoSansLepcha-Regular.ttf
index 4d3b1ad..dbaad0c 100644
--- a/other/NotoSansLepcha-Regular.ttf
+++ b/other/NotoSansLepcha-Regular.ttf
Binary files differ
diff --git a/other/NotoSansLimbu-Regular.ttf b/other/NotoSansLimbu-Regular.ttf
index 40f7c89..87010b1 100644
--- a/other/NotoSansLimbu-Regular.ttf
+++ b/other/NotoSansLimbu-Regular.ttf
Binary files differ
diff --git a/other/NotoSansLinearB-Regular.ttf b/other/NotoSansLinearB-Regular.ttf
new file mode 100644
index 0000000..438b51b
--- /dev/null
+++ b/other/NotoSansLinearB-Regular.ttf
Binary files differ
diff --git a/other/NotoSansLisu-Regular.ttf b/other/NotoSansLisu-Regular.ttf
index 620f05e..aadd12d 100644
--- a/other/NotoSansLisu-Regular.ttf
+++ b/other/NotoSansLisu-Regular.ttf
Binary files differ
diff --git a/other/NotoSansLycian-Regular.ttf b/other/NotoSansLycian-Regular.ttf
new file mode 100644
index 0000000..6e7af0a
--- /dev/null
+++ b/other/NotoSansLycian-Regular.ttf
Binary files differ
diff --git a/other/NotoSansLydian-Regular.ttf b/other/NotoSansLydian-Regular.ttf
new file mode 100644
index 0000000..088d723
--- /dev/null
+++ b/other/NotoSansLydian-Regular.ttf
Binary files differ
diff --git a/other/NotoSansMalayalam-Bold.ttf b/other/NotoSansMalayalam-Bold.ttf
index 766c3f5..74b24d7 100644
--- a/other/NotoSansMalayalam-Bold.ttf
+++ b/other/NotoSansMalayalam-Bold.ttf
Binary files differ
diff --git a/other/NotoSansMalayalam-Regular.ttf b/other/NotoSansMalayalam-Regular.ttf
index 6698a35..1d50dad 100644
--- a/other/NotoSansMalayalam-Regular.ttf
+++ b/other/NotoSansMalayalam-Regular.ttf
Binary files differ
diff --git a/other/NotoSansMalayalamUI-Bold.ttf b/other/NotoSansMalayalamUI-Bold.ttf
index 903a8c1..fa197ba 100644
--- a/other/NotoSansMalayalamUI-Bold.ttf
+++ b/other/NotoSansMalayalamUI-Bold.ttf
Binary files differ
diff --git a/other/NotoSansMalayalamUI-Regular.ttf b/other/NotoSansMalayalamUI-Regular.ttf
index ee3863c..56fe280 100644
--- a/other/NotoSansMalayalamUI-Regular.ttf
+++ b/other/NotoSansMalayalamUI-Regular.ttf
Binary files differ
diff --git a/other/NotoSansMandaic-Regular.ttf b/other/NotoSansMandaic-Regular.ttf
index 154b838..5d8fac9 100644
--- a/other/NotoSansMandaic-Regular.ttf
+++ b/other/NotoSansMandaic-Regular.ttf
Binary files differ
diff --git a/other/NotoSansMeeteiMayek-Regular.ttf b/other/NotoSansMeeteiMayek-Regular.ttf
index b5a364a..c902bab 100644
--- a/other/NotoSansMeeteiMayek-Regular.ttf
+++ b/other/NotoSansMeeteiMayek-Regular.ttf
Binary files differ
diff --git a/other/NotoSansMongolian-Regular.ttf b/other/NotoSansMongolian-Regular.ttf
index 804dccb..31b3b72 100644
--- a/other/NotoSansMongolian-Regular.ttf
+++ b/other/NotoSansMongolian-Regular.ttf
Binary files differ
diff --git a/other/NotoSansMyanmar-Bold.ttf b/other/NotoSansMyanmar-Bold.ttf
index 2a274c8..19b390d 100644
--- a/other/NotoSansMyanmar-Bold.ttf
+++ b/other/NotoSansMyanmar-Bold.ttf
Binary files differ
diff --git a/other/NotoSansMyanmar-Regular.ttf b/other/NotoSansMyanmar-Regular.ttf
index 3692dd0..63b1a2f 100644
--- a/other/NotoSansMyanmar-Regular.ttf
+++ b/other/NotoSansMyanmar-Regular.ttf
Binary files differ
diff --git a/other/NotoSansMyanmarUI-Bold.ttf b/other/NotoSansMyanmarUI-Bold.ttf
index 51eb7c9..20da74d 100644
--- a/other/NotoSansMyanmarUI-Bold.ttf
+++ b/other/NotoSansMyanmarUI-Bold.ttf
Binary files differ
diff --git a/other/NotoSansMyanmarUI-Regular.ttf b/other/NotoSansMyanmarUI-Regular.ttf
index 9d318fd..3bbd21e 100644
--- a/other/NotoSansMyanmarUI-Regular.ttf
+++ b/other/NotoSansMyanmarUI-Regular.ttf
Binary files differ
diff --git a/other/NotoSansNKo-Regular.ttf b/other/NotoSansNKo-Regular.ttf
index 3ea2382..3117ca7 100644
--- a/other/NotoSansNKo-Regular.ttf
+++ b/other/NotoSansNKo-Regular.ttf
Binary files differ
diff --git a/other/NotoSansNewTaiLue-Regular.ttf b/other/NotoSansNewTaiLue-Regular.ttf
index 17d79c0..c949330 100644
--- a/other/NotoSansNewTaiLue-Regular.ttf
+++ b/other/NotoSansNewTaiLue-Regular.ttf
Binary files differ
diff --git a/other/NotoSansOgham-Regular.ttf b/other/NotoSansOgham-Regular.ttf
new file mode 100644
index 0000000..b4d6390
--- /dev/null
+++ b/other/NotoSansOgham-Regular.ttf
Binary files differ
diff --git a/other/NotoSansOlChiki-Regular.ttf b/other/NotoSansOlChiki-Regular.ttf
index 76fbe6e..2773441 100644
--- a/other/NotoSansOlChiki-Regular.ttf
+++ b/other/NotoSansOlChiki-Regular.ttf
Binary files differ
diff --git a/other/NotoSansOldItalic-Regular.ttf b/other/NotoSansOldItalic-Regular.ttf
new file mode 100644
index 0000000..40003d1
--- /dev/null
+++ b/other/NotoSansOldItalic-Regular.ttf
Binary files differ
diff --git a/other/NotoSansOldPersian-Regular.ttf b/other/NotoSansOldPersian-Regular.ttf
new file mode 100644
index 0000000..f5ce2e3
--- /dev/null
+++ b/other/NotoSansOldPersian-Regular.ttf
Binary files differ
diff --git a/other/NotoSansOldSouthArabian-Regular.ttf b/other/NotoSansOldSouthArabian-Regular.ttf
new file mode 100644
index 0000000..becefe1
--- /dev/null
+++ b/other/NotoSansOldSouthArabian-Regular.ttf
Binary files differ
diff --git a/other/NotoSansOldTurkic-Regular.ttf b/other/NotoSansOldTurkic-Regular.ttf
new file mode 100644
index 0000000..c3901bb
--- /dev/null
+++ b/other/NotoSansOldTurkic-Regular.ttf
Binary files differ
diff --git a/other/NotoSansOriya-Bold.ttf b/other/NotoSansOriya-Bold.ttf
index fae50b9..50f9fcc 100644
--- a/other/NotoSansOriya-Bold.ttf
+++ b/other/NotoSansOriya-Bold.ttf
Binary files differ
diff --git a/other/NotoSansOriya-Regular.ttf b/other/NotoSansOriya-Regular.ttf
index 5924c78..a1dc6ba 100644
--- a/other/NotoSansOriya-Regular.ttf
+++ b/other/NotoSansOriya-Regular.ttf
Binary files differ
diff --git a/other/NotoSansOriyaUI-Bold.ttf b/other/NotoSansOriyaUI-Bold.ttf
index a6a83cd..d8b9043 100644
--- a/other/NotoSansOriyaUI-Bold.ttf
+++ b/other/NotoSansOriyaUI-Bold.ttf
Binary files differ
diff --git a/other/NotoSansOriyaUI-Regular.ttf b/other/NotoSansOriyaUI-Regular.ttf
index b18fafc..014fc81 100644
--- a/other/NotoSansOriyaUI-Regular.ttf
+++ b/other/NotoSansOriyaUI-Regular.ttf
Binary files differ
diff --git a/other/NotoSansOsmanya-Regular.ttf b/other/NotoSansOsmanya-Regular.ttf
new file mode 100644
index 0000000..1489568
--- /dev/null
+++ b/other/NotoSansOsmanya-Regular.ttf
Binary files differ
diff --git a/other/NotoSansPhagsPa-Regular.ttf b/other/NotoSansPhagsPa-Regular.ttf
new file mode 100644
index 0000000..b5ac1a7
--- /dev/null
+++ b/other/NotoSansPhagsPa-Regular.ttf
Binary files differ
diff --git a/other/NotoSansPhoenician-Regular.ttf b/other/NotoSansPhoenician-Regular.ttf
new file mode 100644
index 0000000..d4ba9b0
--- /dev/null
+++ b/other/NotoSansPhoenician-Regular.ttf
Binary files differ
diff --git a/other/NotoSansRejang-Regular.ttf b/other/NotoSansRejang-Regular.ttf
index 04c5ab9..3f45857 100644
--- a/other/NotoSansRejang-Regular.ttf
+++ b/other/NotoSansRejang-Regular.ttf
Binary files differ
diff --git a/other/NotoSansRunic-Regular.ttf b/other/NotoSansRunic-Regular.ttf
new file mode 100644
index 0000000..4425c72
--- /dev/null
+++ b/other/NotoSansRunic-Regular.ttf
Binary files differ
diff --git a/other/NotoSansSamaritan-Regular.ttf b/other/NotoSansSamaritan-Regular.ttf
new file mode 100644
index 0000000..96cadfa
--- /dev/null
+++ b/other/NotoSansSamaritan-Regular.ttf
Binary files differ
diff --git a/other/NotoSansSaurashtra-Regular.ttf b/other/NotoSansSaurashtra-Regular.ttf
index ea7bc83..60eedcb 100644
--- a/other/NotoSansSaurashtra-Regular.ttf
+++ b/other/NotoSansSaurashtra-Regular.ttf
Binary files differ
diff --git a/other/NotoSansShavian-Regular.ttf b/other/NotoSansShavian-Regular.ttf
new file mode 100644
index 0000000..67f65bf
--- /dev/null
+++ b/other/NotoSansShavian-Regular.ttf
Binary files differ
diff --git a/other/NotoSansSinhala-Bold.ttf b/other/NotoSansSinhala-Bold.ttf
index 0760568..213a155 100644
--- a/other/NotoSansSinhala-Bold.ttf
+++ b/other/NotoSansSinhala-Bold.ttf
Binary files differ
diff --git a/other/NotoSansSinhala-Regular.ttf b/other/NotoSansSinhala-Regular.ttf
index 86cdeea..4e7c0d4 100644
--- a/other/NotoSansSinhala-Regular.ttf
+++ b/other/NotoSansSinhala-Regular.ttf
Binary files differ
diff --git a/other/NotoSansSundanese-Regular.ttf b/other/NotoSansSundanese-Regular.ttf
index 7549d1a..8a1e903 100644
--- a/other/NotoSansSundanese-Regular.ttf
+++ b/other/NotoSansSundanese-Regular.ttf
Binary files differ
diff --git a/other/NotoSansSylotiNagri-Regular.ttf b/other/NotoSansSylotiNagri-Regular.ttf
index a831ebe..d36cf2b 100644
--- a/other/NotoSansSylotiNagri-Regular.ttf
+++ b/other/NotoSansSylotiNagri-Regular.ttf
Binary files differ
diff --git a/other/NotoSansSyriacEastern-Regular.ttf b/other/NotoSansSyriacEastern-Regular.ttf
new file mode 100644
index 0000000..cdd4826
--- /dev/null
+++ b/other/NotoSansSyriacEastern-Regular.ttf
Binary files differ
diff --git a/other/NotoSansSyriacEstrangela-Regular.ttf b/other/NotoSansSyriacEstrangela-Regular.ttf
index dcb3310..0fa39aa 100644
--- a/other/NotoSansSyriacEstrangela-Regular.ttf
+++ b/other/NotoSansSyriacEstrangela-Regular.ttf
Binary files differ
diff --git a/other/NotoSansSyriacWestern-Regular.ttf b/other/NotoSansSyriacWestern-Regular.ttf
new file mode 100644
index 0000000..168ad39
--- /dev/null
+++ b/other/NotoSansSyriacWestern-Regular.ttf
Binary files differ
diff --git a/other/NotoSansTagalog-Regular.ttf b/other/NotoSansTagalog-Regular.ttf
new file mode 100644
index 0000000..314e871
--- /dev/null
+++ b/other/NotoSansTagalog-Regular.ttf
Binary files differ
diff --git a/other/NotoSansTagbanwa-Regular.ttf b/other/NotoSansTagbanwa-Regular.ttf
index 3aaf4f0..4b652cd 100644
--- a/other/NotoSansTagbanwa-Regular.ttf
+++ b/other/NotoSansTagbanwa-Regular.ttf
Binary files differ
diff --git a/other/NotoSansTaiLe-Regular.ttf b/other/NotoSansTaiLe-Regular.ttf
index 0f59524..5013a12 100644
--- a/other/NotoSansTaiLe-Regular.ttf
+++ b/other/NotoSansTaiLe-Regular.ttf
Binary files differ
diff --git a/other/NotoSansTaiTham-Regular.ttf b/other/NotoSansTaiTham-Regular.ttf
index 821499c..e25ba44 100644
--- a/other/NotoSansTaiTham-Regular.ttf
+++ b/other/NotoSansTaiTham-Regular.ttf
Binary files differ
diff --git a/other/NotoSansTaiViet-Regular.ttf b/other/NotoSansTaiViet-Regular.ttf
index d08fb43..0c59674 100644
--- a/other/NotoSansTaiViet-Regular.ttf
+++ b/other/NotoSansTaiViet-Regular.ttf
Binary files differ
diff --git a/other/NotoSansTamil-Bold.ttf b/other/NotoSansTamil-Bold.ttf
index fee5352..8e88951 100644
--- a/other/NotoSansTamil-Bold.ttf
+++ b/other/NotoSansTamil-Bold.ttf
Binary files differ
diff --git a/other/NotoSansTamil-Regular.ttf b/other/NotoSansTamil-Regular.ttf
index 085afea..33b9c0b 100644
--- a/other/NotoSansTamil-Regular.ttf
+++ b/other/NotoSansTamil-Regular.ttf
Binary files differ
diff --git a/other/NotoSansTamilUI-Bold.ttf b/other/NotoSansTamilUI-Bold.ttf
index 65136f4..ce5df89 100644
--- a/other/NotoSansTamilUI-Bold.ttf
+++ b/other/NotoSansTamilUI-Bold.ttf
Binary files differ
diff --git a/other/NotoSansTamilUI-Regular.ttf b/other/NotoSansTamilUI-Regular.ttf
index 6c7c589..23b815b 100644
--- a/other/NotoSansTamilUI-Regular.ttf
+++ b/other/NotoSansTamilUI-Regular.ttf
Binary files differ
diff --git a/other/NotoSansTelugu-Bold.ttf b/other/NotoSansTelugu-Bold.ttf
index b177d5a..ad63405 100644
--- a/other/NotoSansTelugu-Bold.ttf
+++ b/other/NotoSansTelugu-Bold.ttf
Binary files differ
diff --git a/other/NotoSansTelugu-Regular.ttf b/other/NotoSansTelugu-Regular.ttf
index 76149ab..c8d712c 100644
--- a/other/NotoSansTelugu-Regular.ttf
+++ b/other/NotoSansTelugu-Regular.ttf
Binary files differ
diff --git a/other/NotoSansTeluguUI-Bold.ttf b/other/NotoSansTeluguUI-Bold.ttf
index c8ac2a1..5dd6d41 100644
--- a/other/NotoSansTeluguUI-Bold.ttf
+++ b/other/NotoSansTeluguUI-Bold.ttf
Binary files differ
diff --git a/other/NotoSansTeluguUI-Regular.ttf b/other/NotoSansTeluguUI-Regular.ttf
index 5cf491d..aa1ba15 100644
--- a/other/NotoSansTeluguUI-Regular.ttf
+++ b/other/NotoSansTeluguUI-Regular.ttf
Binary files differ
diff --git a/other/NotoSansThaana-Bold.ttf b/other/NotoSansThaana-Bold.ttf
index 6dd59be..fd8897b 100644
--- a/other/NotoSansThaana-Bold.ttf
+++ b/other/NotoSansThaana-Bold.ttf
Binary files differ
diff --git a/other/NotoSansThaana-Regular.ttf b/other/NotoSansThaana-Regular.ttf
index 01ecfe2..d740b2e 100644
--- a/other/NotoSansThaana-Regular.ttf
+++ b/other/NotoSansThaana-Regular.ttf
Binary files differ
diff --git a/other/NotoSansThai-Bold.ttf b/other/NotoSansThai-Bold.ttf
index f35c0ad..6212350 100644
--- a/other/NotoSansThai-Bold.ttf
+++ b/other/NotoSansThai-Bold.ttf
Binary files differ
diff --git a/other/NotoSansThai-Regular.ttf b/other/NotoSansThai-Regular.ttf
index ad9ea67..d19c99d 100644
--- a/other/NotoSansThai-Regular.ttf
+++ b/other/NotoSansThai-Regular.ttf
Binary files differ
diff --git a/other/NotoSansThaiUI-Bold.ttf b/other/NotoSansThaiUI-Bold.ttf
index 6a68487..8833c21 100644
--- a/other/NotoSansThaiUI-Bold.ttf
+++ b/other/NotoSansThaiUI-Bold.ttf
Binary files differ
diff --git a/other/NotoSansThaiUI-Regular.ttf b/other/NotoSansThaiUI-Regular.ttf
index 1092345..3ef3828 100644
--- a/other/NotoSansThaiUI-Regular.ttf
+++ b/other/NotoSansThaiUI-Regular.ttf
Binary files differ
diff --git a/other/NotoSansTibetan-Regular.ttf b/other/NotoSansTibetan-Regular.ttf
new file mode 100644
index 0000000..de95ffd
--- /dev/null
+++ b/other/NotoSansTibetan-Regular.ttf
Binary files differ
diff --git a/other/NotoSansTifinagh-Regular.ttf b/other/NotoSansTifinagh-Regular.ttf
index 1866e55..2120d7d 100644
--- a/other/NotoSansTifinagh-Regular.ttf
+++ b/other/NotoSansTifinagh-Regular.ttf
Binary files differ
diff --git a/other/NotoSansUI-Bold.ttf b/other/NotoSansUI-Bold.ttf
new file mode 100644
index 0000000..a08c839
--- /dev/null
+++ b/other/NotoSansUI-Bold.ttf
Binary files differ
diff --git a/other/NotoSansUI-BoldItalic.ttf b/other/NotoSansUI-BoldItalic.ttf
new file mode 100644
index 0000000..f83254a
--- /dev/null
+++ b/other/NotoSansUI-BoldItalic.ttf
Binary files differ
diff --git a/other/NotoSansUI-Italic.ttf b/other/NotoSansUI-Italic.ttf
new file mode 100644
index 0000000..9d4e224
--- /dev/null
+++ b/other/NotoSansUI-Italic.ttf
Binary files differ
diff --git a/other/NotoSansUI-Regular.ttf b/other/NotoSansUI-Regular.ttf
new file mode 100644
index 0000000..aafc42a
--- /dev/null
+++ b/other/NotoSansUI-Regular.ttf
Binary files differ
diff --git a/other/NotoSansUgaritic-Regular.ttf b/other/NotoSansUgaritic-Regular.ttf
new file mode 100644
index 0000000..f6a5049
--- /dev/null
+++ b/other/NotoSansUgaritic-Regular.ttf
Binary files differ
diff --git a/other/NotoSansVai-Regular.ttf b/other/NotoSansVai-Regular.ttf
index 0c7a7ac..6da67fb 100644
--- a/other/NotoSansVai-Regular.ttf
+++ b/other/NotoSansVai-Regular.ttf
Binary files differ
diff --git a/other/NotoSansYi-Regular.ttf b/other/NotoSansYi-Regular.ttf
index 71fb876..f9b3a34 100644
--- a/other/NotoSansYi-Regular.ttf
+++ b/other/NotoSansYi-Regular.ttf
Binary files differ
diff --git a/other/NotoSerif-Bold.ttf b/other/NotoSerif-Bold.ttf
index a54567e..e3bdeb6 100644
--- a/other/NotoSerif-Bold.ttf
+++ b/other/NotoSerif-Bold.ttf
Binary files differ
diff --git a/other/NotoSerif-BoldItalic.ttf b/other/NotoSerif-BoldItalic.ttf
index 56ceceb..374cdfd 100644
--- a/other/NotoSerif-BoldItalic.ttf
+++ b/other/NotoSerif-BoldItalic.ttf
Binary files differ
diff --git a/other/NotoSerif-Italic.ttf b/other/NotoSerif-Italic.ttf
index 519b860..6a181c1 100644
--- a/other/NotoSerif-Italic.ttf
+++ b/other/NotoSerif-Italic.ttf
Binary files differ
diff --git a/other/NotoSerif-Regular.ttf b/other/NotoSerif-Regular.ttf
index c4eff9e..da2e7d8 100644
--- a/other/NotoSerif-Regular.ttf
+++ b/other/NotoSerif-Regular.ttf
Binary files differ
diff --git a/other/NotoSerifArmenian-Bold.ttf b/other/NotoSerifArmenian-Bold.ttf
new file mode 100644
index 0000000..b5f604a
--- /dev/null
+++ b/other/NotoSerifArmenian-Bold.ttf
Binary files differ
diff --git a/other/NotoSerifArmenian-Regular.ttf b/other/NotoSerifArmenian-Regular.ttf
new file mode 100644
index 0000000..8f4790a
--- /dev/null
+++ b/other/NotoSerifArmenian-Regular.ttf
Binary files differ
diff --git a/other/NotoSerifGeorgian-Bold.ttf b/other/NotoSerifGeorgian-Bold.ttf
new file mode 100644
index 0000000..3639ad2
--- /dev/null
+++ b/other/NotoSerifGeorgian-Bold.ttf
Binary files differ
diff --git a/other/NotoSerifGeorgian-Regular.ttf b/other/NotoSerifGeorgian-Regular.ttf
new file mode 100644
index 0000000..3698415
--- /dev/null
+++ b/other/NotoSerifGeorgian-Regular.ttf
Binary files differ
diff --git a/other/NotoSerifKhmer-Bold.ttf b/other/NotoSerifKhmer-Bold.ttf
new file mode 100644
index 0000000..01b39cc
--- /dev/null
+++ b/other/NotoSerifKhmer-Bold.ttf
Binary files differ
diff --git a/other/NotoSerifKhmer-Regular.ttf b/other/NotoSerifKhmer-Regular.ttf
new file mode 100644
index 0000000..80df402
--- /dev/null
+++ b/other/NotoSerifKhmer-Regular.ttf
Binary files differ
diff --git a/other/NotoSerifLao-Bold.ttf b/other/NotoSerifLao-Bold.ttf
new file mode 100644
index 0000000..f4d243e
--- /dev/null
+++ b/other/NotoSerifLao-Bold.ttf
Binary files differ
diff --git a/other/NotoSerifLao-Regular.ttf b/other/NotoSerifLao-Regular.ttf
new file mode 100644
index 0000000..2871b2b
--- /dev/null
+++ b/other/NotoSerifLao-Regular.ttf
Binary files differ
diff --git a/other/NotoSerifThai-Bold.ttf b/other/NotoSerifThai-Bold.ttf
new file mode 100644
index 0000000..076a2f5
--- /dev/null
+++ b/other/NotoSerifThai-Bold.ttf
Binary files differ
diff --git a/other/NotoSerifThai-Regular.ttf b/other/NotoSerifThai-Regular.ttf
new file mode 100644
index 0000000..209f36c
--- /dev/null
+++ b/other/NotoSerifThai-Regular.ttf
Binary files differ
diff --git a/other/README.android b/other/README.android
index eda76bd..a251768 100644
--- a/other/README.android
+++ b/other/README.android
@@ -1,5 +1,5 @@
 URL: https://code.google.com/p/noto/
-Version: various
+Version: 8f8738b214463d357d30058d69dc0a9f7d9ae8fb
 License: Apache 2.0
 License File: NOTICE
 
@@ -7,10 +7,12 @@
 Noto fonts, for supporting several languages and scripts.
 
 Local Modifications:
-This directory does not necessarily track upstream exactly, and
-contains only the fonts needed for Android (the unhinted versions in
-particular). We do not include any of the tools.
+This directory tracks the upstream result of running 'make android',
+which compresses the unhinted fonts (and in case of Malayalam and
+Tamil UI fonts, scales the fonts down by 90%). It does not include any
+of the tools.
 
-Additionally:
-* The fonts here may be subsetted or compressed for size.
-* Tamil and Malayalam fonts are scaled by 90%.
+We also include two subsetted copies of NotoSansSymbols, which are
+built into different font profiles.
+
+Not all the files are included in the Android build.