diff --git a/java/res/xml-land/kbd_number.xml b/java/res/xml-land/kbd_number.xml
deleted file mode 100644
index 0cc244ac0..000000000
--- a/java/res/xml-land/kbd_number.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2011, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
-    latin:keyboardLeftPadding="10%p"
-    latin:keyboardRightPadding="10%p"
-    latin:keyWidth="26.67%p"
-    latin:touchPositionCorrectionData="@array/touch_position_correction_data_default"
->
-    <include
-        latin:keyboardLayout="@xml/rows_number" />
-</Keyboard>
diff --git a/java/res/xml-land/kbd_phone.xml b/java/res/xml-land/kbd_phone.xml
deleted file mode 100644
index 6755468e3..000000000
--- a/java/res/xml-land/kbd_phone.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2011, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
-    latin:keyboardLeftPadding="10%p"
-    latin:keyboardRightPadding="10%p"
-    latin:keyWidth="26.67%p"
-    latin:touchPositionCorrectionData="@array/touch_position_correction_data_default"
->
-    <include
-        latin:keyboardLayout="@xml/rows_phone" />
-</Keyboard>
diff --git a/java/res/xml-land/kbd_phone_symbols.xml b/java/res/xml-land/kbd_phone_symbols.xml
deleted file mode 100644
index 7528b3e77..000000000
--- a/java/res/xml-land/kbd_phone_symbols.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2008, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
-    latin:keyboardLeftPadding="10%p"
-    latin:keyboardRightPadding="10%p"
-    latin:keyWidth="26.67%p"
-    latin:touchPositionCorrectionData="@array/touch_position_correction_data_default"
->
-    <include
-        latin:keyboardLayout="@xml/rows_phone_symbols" />
-</Keyboard>
diff --git a/java/res/xml-v16/keystyle_devanagari_sign_anusvara.xml b/java/res/xml-v16/keystyle_devanagari_sign_anusvara.xml
deleted file mode 100644
index 439fda00d..000000000
--- a/java/res/xml-v16/keystyle_devanagari_sign_anusvara.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2013, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- The code point U+25CC for key label is needed because the font rendering system prior to
-     API version 16 can't automatically render dotted circle for incomplete combining letter
-     of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
-     counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <switch>
-        <case latin:keyboardLayoutSet="hindi_compact">
-            <!-- U+0903: "ः‍" DEVANAGARI SIGN VISARGA
-                 U+0901: "ँ" DEVANAGARI SIGN CANDRABINDU
-                 U+093C: "़" DEVANAGARI SIGN NUKTA -->
-            <key-style
-                latin:styleName="moreKeysDevanagariSignAnusvara"
-                latin:moreKeys="&#x0903;,&#x0901;,&#x093C;" />
-        </case>
-        <case latin:keyboardLayoutSet="marathi">
-            <!-- U+0903: "ः‍" DEVANAGARI SIGN VISARGA
-                 U+0901: "ँ" DEVANAGARI SIGN CANDRABINDU -->
-            <key-style
-                latin:styleName="moreKeysDevanagariSignAnusvara"
-                latin:moreKeys="&#x0903;,&#x0901;" />
-        </case>
-        <default>
-            <key-style latin:styleName="moreKeysDevanagariSignAnusvara" />
-        </default>
-    </switch>
-    <!-- U+0902: "ं" DEVANAGARI SIGN ANUSVARA -->
-    <key-style
-        latin:styleName="baseKeyDevanagariSignAnusvara"
-        latin:parentStyle="moreKeysDevanagariSignAnusvara"
-        latin:keySpec="&#x0902;" />
-</merge>
diff --git a/java/res/xml-v16/keystyle_devanagari_sign_candrabindu.xml b/java/res/xml-v16/keystyle_devanagari_sign_candrabindu.xml
deleted file mode 100644
index 1c114b7d7..000000000
--- a/java/res/xml-v16/keystyle_devanagari_sign_candrabindu.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2013, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- The code point U+25CC for key label is needed because the font rendering system prior to
-     API version 16 can't automatically render dotted circle for incomplete combining letter
-     of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
-     counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <switch>
-        <case latin:keyboardLayoutSet="hindi">
-            <!-- U+0945: "ॅ" DEVANAGARI VOWEL SIGN CANDRA E -->
-            <key-style
-                latin:styleName="moreKeysDevanagariSignCandrabindu"
-                latin:moreKeys="&#x0945;" />
-        </case>
-        <default>
-            <key-style latin:styleName="moreKeysDevanagariSignCandrabindu" />
-        </default>
-    </switch>
-    <!-- U+0901: "ँ" DEVANAGARI SIGN CANDRABINDU -->
-    <key-style
-        latin:styleName="baseKeyDevanagariSignCandrabindu"
-        latin:parentStyle="moreKeysDevanagariSignCandrabindu"
-        latin:keySpec="&#x0901;" />
-</merge>
diff --git a/java/res/xml-v16/keystyle_devanagari_sign_nukta.xml b/java/res/xml-v16/keystyle_devanagari_sign_nukta.xml
deleted file mode 100644
index b7eccfc1b..000000000
--- a/java/res/xml-v16/keystyle_devanagari_sign_nukta.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2013, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- The code point U+25CC for key label is needed because the font rendering system prior to
-     API version 16 can't automatically render dotted circle for incomplete combining letter
-     of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
-     counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <switch>
-        <case latin:keyboardLayoutSet="hindi">
-            <!-- U+097D: "ॽ" DEVANAGARI LETTER GLOTTAL STOP
-                 U+0970: "॰" DEVANAGARI ABBREVIATION SIGN
-                 U+093D: "ऽ" DEVANAGARI SIGN AVAGRAHA -->
-            <key-style
-                latin:styleName="moreKeysDevanagariSignNukta"
-                latin:moreKeys="&#x097D;,&#x0970;,&#x093D;" />
-        </case>
-        <case latin:keyboardLayoutSet="nepali_romanized">
-            <!-- U+093C: "़" DEVANAGARI SIGN NUKTA -->
-            <key-style
-                latin:styleName="moreKeysDevanagariSignNukta"
-                latin:moreKeys="&#x093C;" />
-        </case>
-        <default>
-            <key-style latin:styleName="moreKeysDevanagariSignNukta" />
-        </default>
-    </switch>
-    <!-- U+093C: "़" DEVANAGARI SIGN NUKTA -->
-    <key-style
-        latin:styleName="baseKeyDevanagariSignNukta"
-        latin:parentStyle="moreKeysDevanagariSignNukta"
-        latin:keySpec="&#x093C;" />
-</merge>
diff --git a/java/res/xml-v16/keystyle_devanagari_sign_virama.xml b/java/res/xml-v16/keystyle_devanagari_sign_virama.xml
deleted file mode 100644
index 996a061a5..000000000
--- a/java/res/xml-v16/keystyle_devanagari_sign_virama.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2013, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- The code point U+25CC for key label is needed because the font rendering system prior to
-     API version 16 can't automatically render dotted circle for incomplete combining letter
-     of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
-     counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <switch>
-        <case latin:keyboardLayoutSet="hindi_compact">
-            <!-- U+094D: "्" DEVANAGARI SIGN VIRAMA -->
-            <key-style
-                latin:styleName="moreKeySpecDevanagariSignVirama"
-                latin:moreKeys="&#x094D;" />
-            <!-- U+0945: "ॅ" DEVANAGARI VOWEL SIGN CANDRA E
-                 U+090D: "ऍ" DEVANAGARI LETTER CANDRA E -->
-            <key-style
-                latin:styleName="moreKeysDevanagariSignVirama"
-                latin:moreKeys="&#x0945;,&#x090D;" />
-        </case>
-        <case latin:keyboardLayoutSet="marathi">
-            <!-- U+0905: "अ" DEVANAGARI LETTER A -->
-            <key-style
-                latin:styleName="moreKeysDevanagariSignVirama"
-                latin:moreKeys="&#x0905;" />
-        </case>
-        <default>
-            <key-style latin:styleName="moreKeysDevanagariSignVirama" />
-        </default>
-    </switch>
-    <!-- U+094D: "्" DEVANAGARI SIGN VIRAMA -->
-    <key-style
-        latin:styleName="baseKeyDevanagariSignVirama"
-        latin:parentStyle="moreKeysDevanagariSignVirama"
-        latin:keySpec="&#x094D;" />
-</merge>
diff --git a/java/res/xml-v16/keystyle_devanagari_sign_visarga.xml b/java/res/xml-v16/keystyle_devanagari_sign_visarga.xml
deleted file mode 100644
index 71befd936..000000000
--- a/java/res/xml-v16/keystyle_devanagari_sign_visarga.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2013, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- The code point U+25CC for key label is needed because the font rendering system prior to
-     API version 16 can't automatically render dotted circle for incomplete combining letter
-     of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
-     counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <!-- U+0903: "ः" DEVANAGARI SIGN VISARGA -->
-    <key-style
-        latin:styleName="baseKeyDevanagariSignVisarga"
-        latin:keySpec="&#x0903;" />
-</merge>
diff --git a/java/res/xml-v16/keystyle_devanagari_vowel_sign_aa.xml b/java/res/xml-v16/keystyle_devanagari_vowel_sign_aa.xml
deleted file mode 100644
index 076db679f..000000000
--- a/java/res/xml-v16/keystyle_devanagari_vowel_sign_aa.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2013, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- The code point U+25CC for key label is needed because the font rendering system prior to
-     API version 16 can't automatically render dotted circle for incomplete combining letter
-     of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
-     counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <switch>
-        <case latin:keyboardLayoutSet="hindi">
-            <!-- U+093E/U+0902: "ां" DEVANAGARI VOWEL SIGN AA/DEVANAGARI SIGN ANUSVARA
-                 U+093E/U+0901: "ाँ" DEVANAGARI VOWEL SIGN AA/DEVANAGARI SIGN CANDRABINDU -->
-            <key-style
-                latin:styleName="moreKeysDevanagariVowelSignAa"
-                latin:moreKeys="&#x093E;&#x0902;,&#x093E;&#x0901;,%" />
-        </case>
-        <case latin:keyboardLayoutSet="hindi_compact">
-            <!-- U+093E: "ा" DEVANAGARI VOWEL SIGN AA -->
-            <key-style
-                latin:styleName="moreKeysDevanagariVowelSignAa"
-                latin:moreKeys="&#x093E;,%" />
-        </case>
-        <case latin:keyboardLayoutSet="marathi">
-            <!-- U+0906: "आ" DEVANAGARI LETTER AA -->
-            <key-style
-                latin:styleName="moreKeysDevanagariVowelSignAa"
-                latin:moreKeys="&#x0906;,%" />
-        </case>
-        <default>
-            <key-style latin:styleName="moreKeysDevanagariVowelSignAa" />
-        </default>
-    </switch>
-    <!-- U+093E: "ा" DEVANAGARI VOWEL SIGN AA -->
-    <key-style
-        latin:styleName="baseKeyDevanagariVowelSignAa"
-        latin:parentStyle="moreKeysDevanagariVowelSignAa"
-        latin:keySpec="&#x093E;" />
-</merge>
diff --git a/java/res/xml-v16/keystyle_devanagari_vowel_sign_ai.xml b/java/res/xml-v16/keystyle_devanagari_vowel_sign_ai.xml
deleted file mode 100644
index 91d1de25a..000000000
--- a/java/res/xml-v16/keystyle_devanagari_vowel_sign_ai.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2013, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- The code point U+25CC for key label is needed because the font rendering system prior to
-     API version 16 can't automatically render dotted circle for incomplete combining letter
-     of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
-     counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <switch>
-        <case latin:keyboardLayoutSet="hindi">
-            <!-- U+0948/U+0902: "ैं" DEVANAGARI VOWEL SIGN AI/DEVANAGARI SIGN ANUSVARA -->
-            <key-style
-                latin:styleName="moreKeysDevanagariVowelSignAi"
-                latin:moreKeys="&#x0948;&#x0902;,%" />
-        </case>
-        <case latin:keyboardLayoutSet="hindi_compact">
-            <!-- U+0948: "ै" DEVANAGARI VOWEL SIGN AI -->
-            <key-style
-                latin:styleName="moreKeysDevanagariVowelSignAi"
-                latin:moreKeys="&#x0948;,%" />
-        </case>
-        <case latin:keyboardLayoutSet="marathi">
-            <!-- U+0910: "ऐ" DEVANAGARI LETTER AI -->
-            <key-style
-                latin:styleName="moreKeysDevanagariVowelSignAi"
-                latin:moreKeys="&#x0910;,%" />
-        </case>
-        <case latin:keyboardLayoutSet="nepali_traditional">
-            <!-- U+0936/U+094D/U+0930: "श्र" DEVANAGARI LETTER SHA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER RA -->
-            <key-style
-                latin:styleName="moreKeysDevanagariVowelSignAi"
-                latin:moreKeys="&#x0936;&#x094D;&#x0930;" />
-        </case>
-        <default>
-            <key-style latin:styleName="moreKeysDevanagariVowelSignAi" />
-        </default>
-    </switch>
-    <!-- U+0948: "ै" DEVANAGARI VOWEL SIGN AI -->
-    <key-style
-        latin:styleName="baseKeyDevanagariVowelSignAi"
-        latin:parentStyle="moreKeysDevanagariVowelSignAi"
-        latin:keySpec="&#x0948;" />
-</merge>
diff --git a/java/res/xml-v16/keystyle_devanagari_vowel_sign_au.xml b/java/res/xml-v16/keystyle_devanagari_vowel_sign_au.xml
deleted file mode 100644
index 50cfd6500..000000000
--- a/java/res/xml-v16/keystyle_devanagari_vowel_sign_au.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2013, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- The code point U+25CC for key label is needed because the font rendering system prior to
-     API version 16 can't automatically render dotted circle for incomplete combining letter
-     of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
-     counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <switch>
-        <case latin:keyboardLayoutSet="hindi">
-            <!--U+094C/U+0902: "ौं" DEVANAGARI VOWEL SIGN AU/DEVANAGARI SIGN ANUSVARA -->
-            <key-style
-                latin:styleName="moreKeysDevanagariVowelSignAu"
-                latin:moreKeys="&#x094C;&#x0902;,%" />
-        </case>
-        <case latin:keyboardLayoutSet="hindi_compact">
-            <!-- U+094C: "ौ" DEVANAGARI VOWEL SIGN AU -->
-            <key-style
-                latin:styleName="moreKeysDevanagariVowelSignAu"
-                latin:moreKeys="&#x094C;,%" />
-        </case>
-        <case latin:keyboardLayoutSet="marathi">
-            <!-- U+0914: "औ" DEVANAGARI LETTER AU -->
-            <key-style
-                latin:styleName="moreKeysDevanagariVowelSignAu"
-                latin:moreKeys="&#x0914;,%" />
-        </case>
-        <default>
-            <key-style latin:styleName="moreKeysDevanagariVowelSignAu" />
-        </default>
-    </switch>
-    <!-- U+094C: "ौ" DEVANAGARI VOWEL SIGN AU -->
-    <key-style
-        latin:styleName="baseKeyDevanagariVowelSignAu"
-        latin:parentStyle="moreKeysDevanagariVowelSignAu"
-        latin:keySpec="&#x094C;" />
-</merge>
diff --git a/java/res/xml-v16/keystyle_devanagari_vowel_sign_candra_e.xml b/java/res/xml-v16/keystyle_devanagari_vowel_sign_candra_e.xml
deleted file mode 100644
index 805446a2c..000000000
--- a/java/res/xml-v16/keystyle_devanagari_vowel_sign_candra_e.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2014, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- The code point U+25CC for key label is needed because the font rendering system prior to
-     API version 16 can't automatically render dotted circle for incomplete combining letter
-     of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
-     counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <switch>
-        <case latin:keyboardLayoutSet="hindi_compact">
-            <!-- U+0945: "ॅ" DEVANAGARI VOWEL SIGN CANDRA E -->
-            <key-style
-                latin:styleName="moreKeysDevanagariVowelSignCandraE"
-                latin:moreKeys="&#x0945;" />
-        </case>
-        <case latin:keyboardLayoutSet="marathi">
-            <!-- U+090D: "ऍ" DEVANAGARI LETTER CANDRA E -->
-            <key-style
-                latin:styleName="moreKeysDevanagariVowelSignCandraE"
-                latin:moreKeys="&#x090D;" />
-        </case>
-        <default>
-            <key-style latin:styleName="moreKeysDevanagariVowelSignCandraE" />
-        </default>
-    </switch>
-    <!-- U+0945: "ॅ" DEVANAGARI VOWEL SIGN CANDRA E -->
-    <key-style
-        latin:styleName="baseKeyDevanagariVowelSignCandraE"
-        latin:parentStyle="moreKeysDevanagariVowelSignCandraE"
-        latin:keySpec="&#x0945;" />
-</merge>
diff --git a/java/res/xml-v16/keystyle_devanagari_vowel_sign_candra_o.xml b/java/res/xml-v16/keystyle_devanagari_vowel_sign_candra_o.xml
deleted file mode 100644
index 5e446c012..000000000
--- a/java/res/xml-v16/keystyle_devanagari_vowel_sign_candra_o.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2013, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- The code point U+25CC for key label is needed because the font rendering system prior to
-     API version 16 can't automatically render dotted circle for incomplete combining letter
-     of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
-     counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <switch>
-        <case latin:keyboardLayoutSet="hindi_compact">
-            <!-- U+0949: "ॉ" DEVANAGARI VOWEL SIGN CANDRA O -->
-            <key-style
-                latin:styleName="moreKeysDevanagariVowelSignCandraO"
-                latin:moreKeys="&#x0949;" />
-        </case>
-        <case latin:keyboardLayoutSet="marathi">
-            <!-- U+0911: "ऑ" DEVANAGARI LETTER CANDRA O -->
-            <key-style
-                latin:styleName="moreKeysDevanagariVowelSignCandraO"
-                latin:moreKeys="&#x0911;" />
-        </case>
-        <default>
-            <key-style latin:styleName="moreKeysDevanagariVowelSignCandraO" />
-        </default>
-    </switch>
-    <!-- U+0949: "ॉ" DEVANAGARI VOWEL SIGN CANDRA O -->
-    <key-style
-        latin:styleName="baseKeyDevanagariVowelSignCandraO"
-        latin:parentStyle="moreKeysDevanagariVowelSignCandraO"
-        latin:keySpec="&#x0949;" />
-</merge>
diff --git a/java/res/xml-v16/keystyle_devanagari_vowel_sign_e.xml b/java/res/xml-v16/keystyle_devanagari_vowel_sign_e.xml
deleted file mode 100644
index bed052e9b..000000000
--- a/java/res/xml-v16/keystyle_devanagari_vowel_sign_e.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2013, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- The code point U+25CC for key label is needed because the font rendering system prior to
-     API version 16 can't automatically render dotted circle for incomplete combining letter
-     of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
-     counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <switch>
-        <case latin:keyboardLayoutSet="hindi">
-            <!-- U+0947/U+0902: "ें" DEVANAGARI VOWEL SIGN E/DEVANAGARI SIGN ANUSVARA -->
-            <key-style
-                latin:styleName="moreKeysDevanagariVowelSignE"
-                latin:moreKeys="&#x0947;&#x0902;" />
-        </case>
-        <case latin:keyboardLayoutSet="hindi_compact">
-            <!-- U+0947: "े" DEVANAGARI VOWEL SIGN E -->
-            <key-style
-                latin:styleName="moreKeysDevanagariVowelSignE"
-                latin:moreKeys="&#x0947;" />
-        </case>
-        <case latin:keyboardLayoutSet="marathi">
-            <!-- U+090F: "ए" DEVANAGARI LETTER SHORT E -->
-            <key-style
-                latin:styleName="moreKeysDevanagariVowelSignE"
-                latin:moreKeys="&#x090F;" />
-        </case>
-        <case latin:keyboardLayoutSet="nepali_traditional">
-            <!-- U+0903: "ः‍" DEVANAGARI SIGN VISARGA
-                 U+093D: "ऽ" DEVANAGARI SIGN AVAGRAHA -->
-            <key-style
-                latin:styleName="moreKeysDevanagariVowelSignE"
-                latin:moreKeys="&#x0903;,&#x093D;" />
-        </case>
-        <default>
-            <key-style latin:styleName="moreKeysDevanagariVowelSignE" />
-        </default>
-    </switch>
-    <!-- U+0947: "े" DEVANAGARI VOWEL SIGN E -->
-    <key-style
-        latin:styleName="baseKeyDevanagariVowelSignE"
-        latin:parentStyle="moreKeysDevanagariVowelSignE"
-        latin:keySpec="&#x0947;" />
-</merge>
diff --git a/java/res/xml-v16/keystyle_devanagari_vowel_sign_i.xml b/java/res/xml-v16/keystyle_devanagari_vowel_sign_i.xml
deleted file mode 100644
index 60d27119f..000000000
--- a/java/res/xml-v16/keystyle_devanagari_vowel_sign_i.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2013, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- The code point U+25CC for key label is needed because the font rendering system prior to
-     API version 16 can't automatically render dotted circle for incomplete combining letter
-     of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
-     counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <switch>
-        <case latin:keyboardLayoutSet="hindi">
-            <!-- U+093F/U+0902: "िं" DEVANAGARI VOWEL SIGN I/DEVANAGARI SIGN ANUSVARA -->
-            <key-style
-                latin:styleName="moreKeysDevanagariVowelSignI"
-                latin:moreKeys="&#x093F;&#x0902;" />
-        </case>
-        <case latin:keyboardLayoutSet="hindi_compact">
-            <!-- U+093F: "ि" DEVANAGARI VOWEL SIGN I -->
-            <key-style
-                latin:styleName="moreKeysDevanagariVowelSignI"
-                latin:moreKeys="&#x093F;" />
-        </case>
-        <case latin:keyboardLayoutSet="marathi">
-            <!-- U+0907: "इ" DEVANAGARI LETTER I -->
-            <key-style
-                latin:styleName="moreKeysDevanagariVowelSignI"
-                latin:moreKeys="&#x0907;" />
-        </case>
-        <default>
-            <key-style latin:styleName="moreKeysDevanagariVowelSignI" />
-        </default>
-    </switch>
-    <!-- U+093F: "ि" DEVANAGARI VOWEL SIGN I -->
-    <key-style
-        latin:styleName="baseKeyDevanagariVowelSignI"
-        latin:parentStyle="moreKeysDevanagariVowelSignI"
-        latin:keySpec="&#x093F;" />
-</merge>
diff --git a/java/res/xml-v16/keystyle_devanagari_vowel_sign_ii.xml b/java/res/xml-v16/keystyle_devanagari_vowel_sign_ii.xml
deleted file mode 100644
index 3e3b56c51..000000000
--- a/java/res/xml-v16/keystyle_devanagari_vowel_sign_ii.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2013, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- The code point U+25CC for key label is needed because the font rendering system prior to
-     API version 16 can't automatically render dotted circle for incomplete combining letter
-     of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
-     counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <switch>
-        <case latin:keyboardLayoutSet="hindi">
-            <!-- U+0940/U+0902: "ीं" DEVANAGARI VOWEL SIGN II/DEVANAGARI SIGN ANUSVARA -->
-            <key-style
-                latin:styleName="moreKeysDevanagariVowelSignIi"
-                latin:moreKeys="&#x0940;&#x0902;,%" />
-        </case>
-        <case latin:keyboardLayoutSet="hindi_compact">
-            <!-- U+0940: "ी" DEVANAGARI VOWEL SIGN II -->
-            <key-style
-                latin:styleName="moreKeysDevanagariVowelSignIi"
-                latin:moreKeys="&#x0940;,%" />
-        </case>
-        <case latin:keyboardLayoutSet="marathi">
-            <!-- U+0908: "ई" DEVANAGARI LETTER II -->
-            <key-style
-                latin:styleName="moreKeysDevanagariVowelSignIi"
-                latin:moreKeys="&#x0908;,%" />
-        </case>
-        <default>
-            <key-style latin:styleName="moreKeysDevanagariVowelSignIi" />
-        </default>
-    </switch>
-    <!-- U+0940: "ी" DEVANAGARI VOWEL SIGN II -->
-    <key-style
-        latin:styleName="baseKeyDevanagariVowelSignIi"
-        latin:parentStyle="moreKeysDevanagariVowelSignIi"
-        latin:keySpec="&#x0940;" />
-</merge>
diff --git a/java/res/xml-v16/keystyle_devanagari_vowel_sign_o.xml b/java/res/xml-v16/keystyle_devanagari_vowel_sign_o.xml
deleted file mode 100644
index 608a0980d..000000000
--- a/java/res/xml-v16/keystyle_devanagari_vowel_sign_o.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2013, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- The code point U+25CC for key label is needed because the font rendering system prior to
-     API version 16 can't automatically render dotted circle for incomplete combining letter
-     of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
-     counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <switch>
-        <case latin:keyboardLayoutSet="hindi">
-            <!-- U+094B/U+0902: "ों" DEVANAGARI VOWEL SIGN O/DEVANAGARI SIGN ANUSVARA
-                 U+0949: "ॉ" DEVANAGARI VOWEL SIGN CANDRA O
-                 U+094A: "ॊ" DEVANAGARI VOWEL SIGN SHORT O -->
-            <key-style
-                latin:styleName="moreKeysDevanagariVowelSignO"
-                latin:moreKeys="&#x094B;&#x0902;,&#x0949;,&#x094A;" />
-        </case>
-        <case latin:keyboardLayoutSet="hindi_compact">
-            <!-- U+094B: "ो" DEVANAGARI VOWEL SIGN O -->
-            <key-style
-                latin:styleName="moreKeysDevanagariVowelSignO"
-                latin:moreKeys="&#x094B;" />
-        </case>
-        <case latin:keyboardLayoutSet="marathi">
-            <!-- U+0913: "ओ" DEVANAGARI LETTER O -->
-            <key-style
-                latin:styleName="moreKeysDevanagariVowelSignO"
-                latin:moreKeys="&#x0913;" />
-        </case>
-        <default>
-            <key-style latin:styleName="moreKeysDevanagariVowelSignO" />
-        </default>
-    </switch>
-    <!-- U+094B: "ो" DEVANAGARI VOWEL SIGN O -->
-    <key-style
-        latin:styleName="baseKeyDevanagariVowelSignO"
-        latin:parentStyle="moreKeysDevanagariVowelSignO"
-        latin:keySpec="&#x094B;" />
-</merge>
diff --git a/java/res/xml-v16/keystyle_devanagari_vowel_sign_u.xml b/java/res/xml-v16/keystyle_devanagari_vowel_sign_u.xml
deleted file mode 100644
index acb60710c..000000000
--- a/java/res/xml-v16/keystyle_devanagari_vowel_sign_u.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2013, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- The code point U+25CC for key label is needed because the font rendering system prior to
-     API version 16 can't automatically render dotted circle for incomplete combining letter
-     of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
-     counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <switch>
-        <case latin:keyboardLayoutSet="hindi">
-            <!-- U+0941/U+0902: "ुं" DEVANAGARI VOWEL SIGN U/DEVANAGARI SIGN ANUSVARA
-                 U+0941/U+0901: "ुँ" DEVANAGARI VOWEL SIGN U/DEVANAGARI SIGN CANDRABINDU -->
-            <key-style
-                latin:styleName="moreKeysDevanagariVowelSignU"
-                latin:moreKeys="&#x0941;&#x0902;,&#x0941;&#x0901;" />
-        </case>
-        <case latin:keyboardLayoutSet="hindi_compact">
-            <!-- U+0941: "ु" DEVANAGARI VOWEL SIGN U -->
-            <key-style
-                latin:styleName="moreKeysDevanagariVowelSignU"
-                latin:moreKeys="&#x0941;" />
-        </case>
-        <case latin:keyboardLayoutSet="marathi">
-            <!-- U+0909: "उ" DEVANAGARI LETTER U -->
-            <key-style
-                latin:styleName="moreKeysDevanagariVowelSignU"
-                latin:moreKeys="&#x0909;" />
-        </case>
-        <default>
-            <key-style latin:styleName="moreKeysDevanagariVowelSignU" />
-        </default>
-    </switch>
-    <!-- U+0941: "ु" DEVANAGARI VOWEL SIGN U -->
-    <key-style
-        latin:styleName="baseKeyDevanagariVowelSignU"
-        latin:parentStyle="moreKeysDevanagariVowelSignU"
-        latin:keySpec="&#x0941;" />
-</merge>
diff --git a/java/res/xml-v16/keystyle_devanagari_vowel_sign_uu.xml b/java/res/xml-v16/keystyle_devanagari_vowel_sign_uu.xml
deleted file mode 100644
index 1adc3bb55..000000000
--- a/java/res/xml-v16/keystyle_devanagari_vowel_sign_uu.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2013, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- The code point U+25CC for key label is needed because the font rendering system prior to
-     API version 16 can't automatically render dotted circle for incomplete combining letter
-     of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
-     counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <switch>
-        <case latin:keyboardLayoutSet="hindi">
-            <!-- U+0942/U+0902: "ूं" DEVANAGARI VOWEL SIGN UU/DEVANAGARI SIGN ANUSVARA
-                 U+0942/U+0901: "ूँ" DEVANAGARI VOWEL SIGN UU/DEVANAGARI SIGN CANDRABINDU -->
-            <key-style
-                latin:styleName="moreKeysDevanagariVowelSignUu"
-                latin:moreKeys="&#x0942;&#x0902;,&#x0942;&#x0901;,%" />
-        </case>
-        <case latin:keyboardLayoutSet="hindi_compact">
-            <!-- U+0942: "ू" DEVANAGARI VOWEL SIGN UU -->
-            <key-style
-                latin:styleName="moreKeysDevanagariVowelSignUu"
-                latin:moreKeys="&#x0942;,%" />
-        </case>
-        <case latin:keyboardLayoutSet="marathi">
-            <!-- U+090A: "ऊ" DEVANAGARI LETTER UU -->
-            <key-style
-                latin:styleName="moreKeysDevanagariVowelSignUu"
-                latin:moreKeys="&#x090A;,%" />
-        </case>
-        <default>
-            <key-style latin:styleName="moreKeysDevanagariVowelSignUu" />
-        </default>
-    </switch>
-    <!-- U+0942: "ू" DEVANAGARI VOWEL SIGN UU -->
-    <key-style
-        latin:styleName="baseKeyDevanagariVowelSignUu"
-        latin:parentStyle="moreKeysDevanagariVowelSignUu"
-        latin:keySpec="&#x0942;" />
-</merge>
diff --git a/java/res/xml-v16/keystyle_devanagari_vowel_sign_vocalic_r.xml b/java/res/xml-v16/keystyle_devanagari_vowel_sign_vocalic_r.xml
deleted file mode 100644
index 268c7d8f9..000000000
--- a/java/res/xml-v16/keystyle_devanagari_vowel_sign_vocalic_r.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2013, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- The code point U+25CC for key label is needed because the font rendering system prior to
-     API version 16 can't automatically render dotted circle for incomplete combining letter
-     of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
-     counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <switch>
-        <case latin:keyboardLayoutSet="hindi">
-            <!-- U+0944: "ॄ" DEVANAGARI VOWEL SIGN VOCALIC RR -->
-            <key-style
-                latin:styleName="moreKeysDevanagariVowelSignVocalicR"
-                latin:moreKeys="&#x0944;" />
-        </case>
-        <case latin:keyboardLayoutSet="hindi_compact">
-            <!-- U+090B: "ऋ" DEVANAGARI LETTER VOCALIC R
-                 U+0943: "ृ" DEVANAGARI VOWEL SIGN VOCALIC R -->
-            <key-style
-                latin:styleName="moreKeysDevanagariVowelSignVocalicR"
-                latin:moreKeys="&#x090B;,&#x0943;" />
-        </case>
-        <case latin:keyboardLayoutSet="marathi">
-            <!-- U+0931: "ऱ" DEVANAGARI LETTER RRA
-                 U+090B: "ऋ" DEVANAGARI LETTER VOCALIC R
-                 U+0943: "ृ" DEVANAGARI VOWEL SIGN VOCALIC R -->
-            <key-style
-                latin:styleName="moreKeysDevanagariVowelSignVocalicR"
-                latin:moreKeys="&#x0931;,&#x090B;,&#x0943;" />
-        </case>
-        <case latin:keyboardLayoutSet="nepali_traditional">
-            <!-- U+0913: "ओ" DEVANAGARI LETTER O -->
-            <key-style
-                latin:styleName="moreKeysDevanagariVowelSignVocalicR"
-                latin:moreKeys="&#x0913;" />
-        </case>
-        <default>
-            <key-style latin:styleName="moreKeysDevanagariVowelSignVocalicR" />
-        </default>
-    </switch>
-    <!-- U+0943: "ृ" DEVANAGARI VOWEL SIGN VOCALIC R -->
-    <key-style
-        latin:styleName="baseKeyDevanagariVowelSignVocalicR"
-        latin:parentStyle="moreKeysDevanagariVowelSignVocalicR"
-        latin:keySpec="&#x0943;" />
-</merge>
diff --git a/java/res/xml/additional_subtype_settings.xml b/java/res/xml/additional_subtype_settings.xml
deleted file mode 100644
index 7964c752b..000000000
--- a/java/res/xml/additional_subtype_settings.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2012 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<PreferenceScreen>
-    <!-- Items will be added at runtime -->
-</PreferenceScreen>
diff --git a/java/res/xml/dictionary_settings.xml b/java/res/xml/dictionary_settings.xml
deleted file mode 100644
index 684dfe5b5..000000000
--- a/java/res/xml/dictionary_settings.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2011, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<PreferenceScreen
-   xmlns:android="http://schemas.android.com/apk/res/android"
-   android:title="@string/dictionary_settings_title"
-   android:summary="@string/dictionary_settings_summary">
-
-</PreferenceScreen>
diff --git a/java/res/xml/kbd_arabic.xml b/java/res/xml/kbd_arabic.xml
deleted file mode 100644
index 4686a4c5b..000000000
--- a/java/res/xml/kbd_arabic.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2011, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <include
-        latin:keyboardLayout="@xml/rows_arabic" />
-</Keyboard>
diff --git a/java/res/xml/kbd_armenian_phonetic.xml b/java/res/xml/kbd_armenian_phonetic.xml
deleted file mode 100644
index 11d8f9124..000000000
--- a/java/res/xml/kbd_armenian_phonetic.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2013, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
-    latin:rowHeight="20%p"
-    latin:verticalGap="@fraction/config_key_vertical_gap_5row"
-    latin:keyLetterSize="@fraction/config_key_letter_ratio_5row"
-    latin:keyShiftedLetterHintRatio="@fraction/config_key_shifted_letter_hint_ratio_5row"
-    latin:touchPositionCorrectionData="@array/touch_position_correction_data_default"
->
-    <include
-        latin:keyboardLayout="@xml/rows_armenian_phonetic" />
-</Keyboard>
diff --git a/java/res/xml/kbd_azerty.xml b/java/res/xml/kbd_azerty.xml
deleted file mode 100644
index 4b95b0109..000000000
--- a/java/res/xml/kbd_azerty.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2011, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <include
-        latin:keyboardLayout="@xml/rows_azerty" />
-</Keyboard>
diff --git a/java/res/xml/kbd_bengali.xml b/java/res/xml/kbd_bengali.xml
deleted file mode 100644
index 5684fb886..000000000
--- a/java/res/xml/kbd_bengali.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2014, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <include
-        latin:keyboardLayout="@xml/rows_bengali" />
-</Keyboard>
diff --git a/java/res/xml/kbd_bengali_akkhor.xml b/java/res/xml/kbd_bengali_akkhor.xml
deleted file mode 100644
index b57926036..000000000
--- a/java/res/xml/kbd_bengali_akkhor.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2014, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<Keyboard xmlns:latin="http://schemas.android.com/apk/res-auto" >
-    <include latin:keyboardLayout="@xml/rows_bengali_akkhor" />
-</Keyboard>
diff --git a/java/res/xml/kbd_bepo.xml b/java/res/xml/kbd_bepo.xml
deleted file mode 100644
index d0226991e..000000000
--- a/java/res/xml/kbd_bepo.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2015 The CyanogenMod Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-<Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <include
-        latin:keyboardLayout="@xml/rows_bepo" />
-</Keyboard>
diff --git a/java/res/xml/kbd_bulgarian.xml b/java/res/xml/kbd_bulgarian.xml
deleted file mode 100644
index 6f09d03e8..000000000
--- a/java/res/xml/kbd_bulgarian.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License"):
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <include
-        latin:keyboardLayout="@xml/rows_bulgarian" />
-</Keyboard>
diff --git a/java/res/xml/kbd_bulgarian_bds.xml b/java/res/xml/kbd_bulgarian_bds.xml
deleted file mode 100644
index 7005eddf1..000000000
--- a/java/res/xml/kbd_bulgarian_bds.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License"):
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <include
-        latin:keyboardLayout="@xml/rows_bulgarian_bds" />
-</Keyboard>
diff --git a/java/res/xml/kbd_colemak.xml b/java/res/xml/kbd_colemak.xml
deleted file mode 100644
index 28ce857cd..000000000
--- a/java/res/xml/kbd_colemak.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <include
-        latin:keyboardLayout="@xml/rows_colemak" />
-</Keyboard>
diff --git a/java/res/xml/kbd_dvorak.xml b/java/res/xml/kbd_dvorak.xml
deleted file mode 100644
index a8f1d0e25..000000000
--- a/java/res/xml/kbd_dvorak.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <include
-        latin:keyboardLayout="@xml/rows_dvorak" />
-</Keyboard>
diff --git a/java/res/xml/kbd_east_slavic.xml b/java/res/xml/kbd_east_slavic.xml
deleted file mode 100644
index 372938e84..000000000
--- a/java/res/xml/kbd_east_slavic.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2011, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License"):
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <include
-        latin:keyboardLayout="@xml/rows_east_slavic" />
-</Keyboard>
diff --git a/java/res/xml/kbd_east_slavic_phonetic.xml b/java/res/xml/kbd_east_slavic_phonetic.xml
deleted file mode 100644
index 0cd459bec..000000000
--- a/java/res/xml/kbd_east_slavic_phonetic.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2011, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License"):
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <include
-        latin:keyboardLayout="@xml/rows_east_slavic_phonetic" />
-</Keyboard>
diff --git a/java/res/xml/kbd_emoji_category1.xml b/java/res/xml/kbd_emoji_category1.xml
deleted file mode 100644
index ade946b17..000000000
--- a/java/res/xml/kbd_emoji_category1.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2013, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
-    latin:keyWidth="@fraction/config_emoji_keyboard_key_width"
-    latin:keyLetterSize="90%p"
-    latin:rowHeight="@fraction/config_emoji_keyboard_row_height"
->
-    <GridRows
-        latin:codesArray="@array/emoji_faces"
-        latin:keyLabelFlags="fontNormal"
-        latin:backgroundType="empty" />
-</Keyboard>
diff --git a/java/res/xml/kbd_emoji_category10.xml b/java/res/xml/kbd_emoji_category10.xml
deleted file mode 100644
index 9188f6f64..000000000
--- a/java/res/xml/kbd_emoji_category10.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2015, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
-    latin:keyWidth="@fraction/config_emoji_keyboard_key_width"
-    latin:keyLetterSize="90%p"
-    latin:rowHeight="@fraction/config_emoji_keyboard_row_height"
->
-    <GridRows
-        latin:codesArray="@array/emoji_eight_food_drink"
-        latin:keyLabelFlags="fontNormal"
-        latin:backgroundType="empty" />
-</Keyboard>
diff --git a/java/res/xml/kbd_emoji_category11.xml b/java/res/xml/kbd_emoji_category11.xml
deleted file mode 100644
index fb5ddf594..000000000
--- a/java/res/xml/kbd_emoji_category11.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2015, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
-    latin:keyWidth="@fraction/config_emoji_keyboard_key_width"
-    latin:keyLetterSize="90%p"
-    latin:rowHeight="@fraction/config_emoji_keyboard_row_height"
->
-    <GridRows
-        latin:codesArray="@array/emoji_eight_travel_places"
-        latin:keyLabelFlags="fontNormal"
-        latin:backgroundType="empty" />
-</Keyboard>
diff --git a/java/res/xml/kbd_emoji_category12.xml b/java/res/xml/kbd_emoji_category12.xml
deleted file mode 100644
index 110cfb4af..000000000
--- a/java/res/xml/kbd_emoji_category12.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2015, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
-    latin:keyWidth="@fraction/config_emoji_keyboard_key_width"
-    latin:keyLetterSize="90%p"
-    latin:rowHeight="@fraction/config_emoji_keyboard_row_height"
->
-    <GridRows
-        latin:codesArray="@array/emoji_eight_activity"
-        latin:keyLabelFlags="fontNormal"
-        latin:backgroundType="empty" />
-</Keyboard>
diff --git a/java/res/xml/kbd_emoji_category13.xml b/java/res/xml/kbd_emoji_category13.xml
deleted file mode 100644
index cd3bcc70c..000000000
--- a/java/res/xml/kbd_emoji_category13.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2015, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
-    latin:keyWidth="@fraction/config_emoji_keyboard_key_width"
-    latin:keyLetterSize="90%p"
-    latin:rowHeight="@fraction/config_emoji_keyboard_row_height"
->
-    <GridRows
-        latin:codesArray="@array/emoji_eight_objects"
-        latin:keyLabelFlags="fontNormal"
-        latin:backgroundType="empty" />
-</Keyboard>
diff --git a/java/res/xml/kbd_emoji_category14.xml b/java/res/xml/kbd_emoji_category14.xml
deleted file mode 100644
index e427cb175..000000000
--- a/java/res/xml/kbd_emoji_category14.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2015, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
-    latin:keyWidth="@fraction/config_emoji_keyboard_key_width"
-    latin:keyLetterSize="90%p"
-    latin:rowHeight="@fraction/config_emoji_keyboard_row_height"
->
-    <GridRows
-        latin:codesArray="@array/emoji_eight_symbols"
-        latin:keyLabelFlags="fontNormal"
-        latin:backgroundType="empty" />
-</Keyboard>
diff --git a/java/res/xml/kbd_emoji_category15.xml b/java/res/xml/kbd_emoji_category15.xml
deleted file mode 100644
index dfdf124c0..000000000
--- a/java/res/xml/kbd_emoji_category15.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2015, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
-    latin:keyWidth="@fraction/config_emoji_keyboard_key_width"
-    latin:keyLetterSize="90%p"
-    latin:rowHeight="@fraction/config_emoji_keyboard_row_height"
->
-    <GridRows
-        latin:codesArray="@array/emoji_eight_flags"
-        latin:keyLabelFlags="fontNormal"
-        latin:backgroundType="empty" />
-</Keyboard>
diff --git a/java/res/xml/kbd_emoji_category16.xml b/java/res/xml/kbd_emoji_category16.xml
deleted file mode 100644
index ece0ef0e4..000000000
--- a/java/res/xml/kbd_emoji_category16.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2015, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
-    latin:keyWidth="@fraction/config_emoji_keyboard_key_width"
-    latin:keyLetterSize="90%p"
-    latin:rowHeight="@fraction/config_emoji_keyboard_row_height"
->
-    <GridRows
-        latin:codesArray="@array/emoji_eight_smiley_people_boring"
-        latin:keyLabelFlags="fontNormal"
-        latin:backgroundType="empty" />
-</Keyboard>
diff --git a/java/res/xml/kbd_emoji_category2.xml b/java/res/xml/kbd_emoji_category2.xml
deleted file mode 100644
index 5aa8420ae..000000000
--- a/java/res/xml/kbd_emoji_category2.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2013, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
-    latin:keyWidth="@fraction/config_emoji_keyboard_key_width"
-    latin:keyLetterSize="90%p"
-    latin:rowHeight="@fraction/config_emoji_keyboard_row_height"
->
-    <GridRows
-        latin:codesArray="@array/emoji_objects"
-        latin:keyLabelFlags="fontNormal"
-        latin:backgroundType="empty" />
-</Keyboard>
diff --git a/java/res/xml/kbd_emoji_category3.xml b/java/res/xml/kbd_emoji_category3.xml
deleted file mode 100644
index 2fa40861c..000000000
--- a/java/res/xml/kbd_emoji_category3.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2013, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
-    latin:keyWidth="@fraction/config_emoji_keyboard_key_width"
-    latin:keyLetterSize="90%p"
-    latin:rowHeight="@fraction/config_emoji_keyboard_row_height"
->
-    <GridRows
-        latin:codesArray="@array/emoji_nature"
-        latin:keyLabelFlags="fontNormal"
-        latin:backgroundType="empty" />
-</Keyboard>
diff --git a/java/res/xml/kbd_emoji_category4.xml b/java/res/xml/kbd_emoji_category4.xml
deleted file mode 100644
index 56b954a4d..000000000
--- a/java/res/xml/kbd_emoji_category4.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2013, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
-    latin:keyWidth="@fraction/config_emoji_keyboard_key_width"
-    latin:keyLetterSize="90%p"
-    latin:rowHeight="@fraction/config_emoji_keyboard_row_height"
->
-    <GridRows
-        latin:codesArray="@array/emoji_places"
-        latin:keyLabelFlags="fontNormal"
-        latin:backgroundType="empty" />
-</Keyboard>
diff --git a/java/res/xml/kbd_emoji_category5.xml b/java/res/xml/kbd_emoji_category5.xml
deleted file mode 100644
index 7034454ae..000000000
--- a/java/res/xml/kbd_emoji_category5.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2013, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
-    latin:keyWidth="@fraction/config_emoji_keyboard_key_width"
-    latin:keyLetterSize="90%p"
-    latin:rowHeight="@fraction/config_emoji_keyboard_row_height"
->
-    <GridRows
-        latin:codesArray="@array/emoji_symbols"
-        latin:keyLabelFlags="fontNormal"
-        latin:backgroundType="empty" />
-</Keyboard>
diff --git a/java/res/xml/kbd_emoji_category6.xml b/java/res/xml/kbd_emoji_category6.xml
deleted file mode 100644
index 64033ad5d..000000000
--- a/java/res/xml/kbd_emoji_category6.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2013, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
-    latin:keyWidth="@fraction/config_emoji_keyboard_key_width"
-    latin:keyLetterSize="90%p"
-    latin:keyLabelSize="60%p"
-    latin:rowHeight="@fraction/config_emoji_keyboard_row_height"
->
-    <GridRows
-        latin:textsArray="@array/emoji_emoticons"
-        latin:keyLabelFlags="fontNormal"
-        latin:backgroundType="empty" />
-</Keyboard>
diff --git a/java/res/xml/kbd_emoji_category7.xml b/java/res/xml/kbd_emoji_category7.xml
deleted file mode 100644
index 24eded61a..000000000
--- a/java/res/xml/kbd_emoji_category7.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2015, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
-    latin:keyWidth="@fraction/config_emoji_keyboard_key_width"
-    latin:keyLetterSize="90%p"
-    latin:rowHeight="@fraction/config_emoji_keyboard_row_height"
->
-    <GridRows
-        latin:codesArray="@array/emoji_flags"
-        latin:keyLabelFlags="fontNormal"
-        latin:backgroundType="empty" />
-</Keyboard>
diff --git a/java/res/xml/kbd_emoji_category8.xml b/java/res/xml/kbd_emoji_category8.xml
deleted file mode 100644
index e0d64451d..000000000
--- a/java/res/xml/kbd_emoji_category8.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2015, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
-    latin:keyWidth="@fraction/config_emoji_keyboard_key_width"
-    latin:keyLetterSize="90%p"
-    latin:rowHeight="@fraction/config_emoji_keyboard_row_height"
->
-    <GridRows
-        latin:codesArray="@array/emoji_eight_smiley_people"
-        latin:keyLabelFlags="fontNormal"
-        latin:backgroundType="empty" />
-</Keyboard>
diff --git a/java/res/xml/kbd_emoji_category9.xml b/java/res/xml/kbd_emoji_category9.xml
deleted file mode 100644
index 93958497f..000000000
--- a/java/res/xml/kbd_emoji_category9.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2015, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
-    latin:keyWidth="@fraction/config_emoji_keyboard_key_width"
-    latin:keyLetterSize="90%p"
-    latin:rowHeight="@fraction/config_emoji_keyboard_row_height"
->
-    <GridRows
-        latin:codesArray="@array/emoji_eight_animals_nature"
-        latin:keyLabelFlags="fontNormal"
-        latin:backgroundType="empty" />
-</Keyboard>
diff --git a/java/res/xml/kbd_emoji_recents.xml b/java/res/xml/kbd_emoji_recents.xml
deleted file mode 100644
index 3a353dbcf..000000000
--- a/java/res/xml/kbd_emoji_recents.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2013, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
-    latin:keyWidth="@fraction/config_emoji_keyboard_key_width"
-    latin:keyLetterSize="@fraction/config_emoji_keyboard_key_letter_size"
-    latin:keyLabelSize="60%p"
-    latin:rowHeight="@fraction/config_emoji_keyboard_row_height"
->
-    <GridRows
-        latin:codesArray="@array/emoji_recents"
-        latin:keyLabelFlags="fontNormal"
-        latin:backgroundType="empty" />
-</Keyboard>
diff --git a/java/res/xml/kbd_farsi.xml b/java/res/xml/kbd_farsi.xml
deleted file mode 100644
index f36e04b91..000000000
--- a/java/res/xml/kbd_farsi.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <include
-        latin:keyboardLayout="@xml/rows_farsi" />
-</Keyboard>
diff --git a/java/res/xml/kbd_georgian.xml b/java/res/xml/kbd_georgian.xml
deleted file mode 100644
index 49785731a..000000000
--- a/java/res/xml/kbd_georgian.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <include
-        latin:keyboardLayout="@xml/rows_georgian" />
-</Keyboard>
diff --git a/java/res/xml/kbd_greek.xml b/java/res/xml/kbd_greek.xml
deleted file mode 100644
index 748ca2c49..000000000
--- a/java/res/xml/kbd_greek.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <include
-        latin:keyboardLayout="@xml/rows_greek" />
-</Keyboard>
diff --git a/java/res/xml/kbd_hebrew.xml b/java/res/xml/kbd_hebrew.xml
deleted file mode 100644
index 4152ea862..000000000
--- a/java/res/xml/kbd_hebrew.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2011, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <include
-        latin:keyboardLayout="@xml/rows_hebrew" />
-</Keyboard>
diff --git a/java/res/xml/kbd_hindi.xml b/java/res/xml/kbd_hindi.xml
deleted file mode 100644
index da1672ac6..000000000
--- a/java/res/xml/kbd_hindi.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <include
-        latin:keyboardLayout="@xml/rows_hindi" />
-</Keyboard>
diff --git a/java/res/xml/kbd_hindi_compact.xml b/java/res/xml/kbd_hindi_compact.xml
deleted file mode 100644
index be1c0f7b8..000000000
--- a/java/res/xml/kbd_hindi_compact.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2014, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <include
-        latin:keyboardLayout="@xml/rows_hindi_compact" />
-</Keyboard>
diff --git a/java/res/xml/kbd_kannada.xml b/java/res/xml/kbd_kannada.xml
deleted file mode 100644
index 69a99cd67..000000000
--- a/java/res/xml/kbd_kannada.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2014, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <include
-        latin:keyboardLayout="@xml/rows_kannada" />
-</Keyboard>
diff --git a/java/res/xml/kbd_khmer.xml b/java/res/xml/kbd_khmer.xml
deleted file mode 100644
index a6c73f2ff..000000000
--- a/java/res/xml/kbd_khmer.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2013, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
-    latin:rowHeight="20%p"
-    latin:verticalGap="@fraction/config_key_vertical_gap_5row"
-    latin:keyLetterSize="@fraction/config_key_letter_ratio_5row"
-    latin:keyShiftedLetterHintRatio="@fraction/config_key_shifted_letter_hint_ratio_5row"
-    latin:touchPositionCorrectionData="@array/touch_position_correction_data_default"
->
-    <include
-        latin:keyboardLayout="@xml/rows_khmer" />
-</Keyboard>
diff --git a/java/res/xml/kbd_kurdish.xml b/java/res/xml/kbd_kurdish.xml
deleted file mode 100644
index 2d06f02d2..000000000
--- a/java/res/xml/kbd_kurdish.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2011, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <include
-        latin:keyboardLayout="@xml/rows_kurdish" />
-</Keyboard>
diff --git a/java/res/xml/kbd_lao.xml b/java/res/xml/kbd_lao.xml
deleted file mode 100644
index 489901e00..000000000
--- a/java/res/xml/kbd_lao.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2013, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
-    latin:rowHeight="20%p"
-    latin:verticalGap="@fraction/config_key_vertical_gap_5row"
-    latin:keyLetterSize="@fraction/config_key_letter_ratio_5row"
-    latin:keyShiftedLetterHintRatio="@fraction/config_key_shifted_letter_hint_ratio_5row"
-    latin:touchPositionCorrectionData="@array/touch_position_correction_data_default"
->
-    <include
-        latin:keyboardLayout="@xml/rows_lao" />
-</Keyboard>
diff --git a/java/res/xml/kbd_malayalam.xml b/java/res/xml/kbd_malayalam.xml
deleted file mode 100644
index 85e0159aa..000000000
--- a/java/res/xml/kbd_malayalam.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2014, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <include
-        latin:keyboardLayout="@xml/rows_malayalam" />
-</Keyboard>
diff --git a/java/res/xml/kbd_marathi.xml b/java/res/xml/kbd_marathi.xml
deleted file mode 100644
index e0ae2225d..000000000
--- a/java/res/xml/kbd_marathi.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2014, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <include
-        latin:keyboardLayout="@xml/rows_marathi" />
-</Keyboard>
diff --git a/java/res/xml/kbd_mongolian.xml b/java/res/xml/kbd_mongolian.xml
deleted file mode 100644
index 57a5d15c3..000000000
--- a/java/res/xml/kbd_mongolian.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License"):
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <include
-        latin:keyboardLayout="@xml/rows_mongolian" />
-</Keyboard>
diff --git a/java/res/xml/kbd_nepali_romanized.xml b/java/res/xml/kbd_nepali_romanized.xml
deleted file mode 100644
index d1b5a277d..000000000
--- a/java/res/xml/kbd_nepali_romanized.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2013, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <include
-        latin:keyboardLayout="@xml/rows_nepali_romanized" />
-</Keyboard>
diff --git a/java/res/xml/kbd_nepali_traditional.xml b/java/res/xml/kbd_nepali_traditional.xml
deleted file mode 100644
index ace0cdc5b..000000000
--- a/java/res/xml/kbd_nepali_traditional.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2013, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <include
-        latin:keyboardLayout="@xml/rows_nepali_traditional" />
-</Keyboard>
diff --git a/java/res/xml/kbd_nordic.xml b/java/res/xml/kbd_nordic.xml
deleted file mode 100644
index 109c254d6..000000000
--- a/java/res/xml/kbd_nordic.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2011, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <include
-        latin:keyboardLayout="@xml/rows_nordic" />
-</Keyboard>
diff --git a/java/res/xml/kbd_number.xml b/java/res/xml/kbd_number.xml
deleted file mode 100644
index 37598a1f3..000000000
--- a/java/res/xml/kbd_number.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2008, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
-    latin:keyWidth="26.67%p"
-    latin:touchPositionCorrectionData="@array/touch_position_correction_data_default"
->
-    <include
-        latin:keyboardLayout="@xml/rows_number" />
-</Keyboard>
diff --git a/java/res/xml/kbd_pcqwerty.xml b/java/res/xml/kbd_pcqwerty.xml
deleted file mode 100644
index 74e4a55f4..000000000
--- a/java/res/xml/kbd_pcqwerty.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
-    latin:rowHeight="20%p"
-    latin:verticalGap="@fraction/config_key_vertical_gap_5row"
-    latin:keyLetterSize="@fraction/config_key_letter_ratio_5row"
-    latin:keyShiftedLetterHintRatio="@fraction/config_key_shifted_letter_hint_ratio_5row"
-    latin:touchPositionCorrectionData="@array/touch_position_correction_data_default"
->
-    <include
-        latin:keyboardLayout="@xml/rows_pcqwerty" />
-</Keyboard>
diff --git a/java/res/xml/kbd_phone.xml b/java/res/xml/kbd_phone.xml
deleted file mode 100644
index 9ca88e205..000000000
--- a/java/res/xml/kbd_phone.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2008, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
-    latin:keyWidth="26.67%p"
-    latin:touchPositionCorrectionData="@array/touch_position_correction_data_default"
->
-    <include
-        latin:keyboardLayout="@xml/rows_phone" />
-</Keyboard>
diff --git a/java/res/xml/kbd_phone_symbols.xml b/java/res/xml/kbd_phone_symbols.xml
deleted file mode 100644
index db90b2810..000000000
--- a/java/res/xml/kbd_phone_symbols.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2008, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
-    latin:keyWidth="26.67%p"
-    latin:touchPositionCorrectionData="@array/touch_position_correction_data_default"
->
-    <include
-        latin:keyboardLayout="@xml/rows_phone_symbols" />
-</Keyboard>
diff --git a/java/res/xml/kbd_qwerty.xml b/java/res/xml/kbd_qwerty.xml
deleted file mode 100644
index 6909874cc..000000000
--- a/java/res/xml/kbd_qwerty.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2008, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <include
-        latin:keyboardLayout="@xml/rows_qwerty" />
-</Keyboard>
diff --git a/java/res/xml/kbd_qwertz.xml b/java/res/xml/kbd_qwertz.xml
deleted file mode 100644
index 609e3e151..000000000
--- a/java/res/xml/kbd_qwertz.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2011, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <include
-        latin:keyboardLayout="@xml/rows_qwertz" />
-</Keyboard>
diff --git a/java/res/xml/kbd_serbian_qwertz.xml b/java/res/xml/kbd_serbian_qwertz.xml
deleted file mode 100644
index 0410376d0..000000000
--- a/java/res/xml/kbd_serbian_qwertz.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2014, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<Keyboard xmlns:latin="http://schemas.android.com/apk/res-auto" >
-    <include latin:keyboardLayout="@xml/rows_serbian_qwertz" />
-</Keyboard>
\ No newline at end of file
diff --git a/java/res/xml/kbd_sinhala.xml b/java/res/xml/kbd_sinhala.xml
deleted file mode 100644
index fa407dd92..000000000
--- a/java/res/xml/kbd_sinhala.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2014, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <include
-        latin:keyboardLayout="@xml/rows_sinhala" />
-</Keyboard>
diff --git a/java/res/xml/kbd_south_slavic.xml b/java/res/xml/kbd_south_slavic.xml
deleted file mode 100644
index 71b760139..000000000
--- a/java/res/xml/kbd_south_slavic.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2011, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <include
-        latin:keyboardLayout="@xml/rows_south_slavic" />
-</Keyboard>
diff --git a/java/res/xml/kbd_spanish.xml b/java/res/xml/kbd_spanish.xml
deleted file mode 100644
index a8b9c1e7f..000000000
--- a/java/res/xml/kbd_spanish.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2011, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <include
-        latin:keyboardLayout="@xml/rows_spanish" />
-</Keyboard>
diff --git a/java/res/xml/kbd_suggestions_pane_template.xml b/java/res/xml/kbd_suggestions_pane_template.xml
deleted file mode 100644
index a8f9a87d5..000000000
--- a/java/res/xml/kbd_suggestions_pane_template.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2011, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<Keyboard xmlns:latin="http://schemas.android.com/apk/res-auto"
-    latin:keyWidth="10%p"
-    latin:rowHeight="@dimen/config_more_suggestions_row_height"
-    >
-</Keyboard>
diff --git a/java/res/xml/kbd_swiss.xml b/java/res/xml/kbd_swiss.xml
deleted file mode 100644
index 3a1d1a6c3..000000000
--- a/java/res/xml/kbd_swiss.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2013, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <include
-        latin:keyboardLayout="@xml/rows_swiss" />
-</Keyboard>
diff --git a/java/res/xml/kbd_symbols.xml b/java/res/xml/kbd_symbols.xml
deleted file mode 100644
index 6bca4dce5..000000000
--- a/java/res/xml/kbd_symbols.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2008, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
-    latin:touchPositionCorrectionData="@array/touch_position_correction_data_default"
->
-    <include
-        latin:keyboardLayout="@xml/rows_symbols" />
-</Keyboard>
diff --git a/java/res/xml/kbd_symbols_shift.xml b/java/res/xml/kbd_symbols_shift.xml
deleted file mode 100644
index 01d6156d5..000000000
--- a/java/res/xml/kbd_symbols_shift.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2008, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
-    latin:touchPositionCorrectionData="@array/touch_position_correction_data_default"
->
-    <include
-        latin:keyboardLayout="@xml/rows_symbols_shift" />
-</Keyboard>
diff --git a/java/res/xml/kbd_tamil.xml b/java/res/xml/kbd_tamil.xml
deleted file mode 100644
index 7456ff99c..000000000
--- a/java/res/xml/kbd_tamil.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2014, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <include
-        latin:keyboardLayout="@xml/rows_tamil" />
-</Keyboard>
diff --git a/java/res/xml/kbd_telugu.xml b/java/res/xml/kbd_telugu.xml
deleted file mode 100644
index 19fdf9545..000000000
--- a/java/res/xml/kbd_telugu.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2014, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <include
-        latin:keyboardLayout="@xml/rows_telugu" />
-</Keyboard>
diff --git a/java/res/xml/kbd_thai.xml b/java/res/xml/kbd_thai.xml
deleted file mode 100644
index 081b6fc6a..000000000
--- a/java/res/xml/kbd_thai.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
-    latin:rowHeight="20%p"
-    latin:verticalGap="@fraction/config_key_vertical_gap_5row"
-    latin:keyLetterSize="@fraction/config_key_letter_ratio_5row"
-    latin:keyShiftedLetterHintRatio="@fraction/config_key_shifted_letter_hint_ratio_5row"
-    latin:touchPositionCorrectionData="@array/touch_position_correction_data_default"
->
-    <include
-        latin:keyboardLayout="@xml/rows_thai" />
-</Keyboard>
diff --git a/java/res/xml/kbd_uzbek.xml b/java/res/xml/kbd_uzbek.xml
deleted file mode 100644
index d577a8e52..000000000
--- a/java/res/xml/kbd_uzbek.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2014, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<Keyboard xmlns:latin="http://schemas.android.com/apk/res-auto" >
-    <include latin:keyboardLayout="@xml/rows_uzbek" />
-</Keyboard>
\ No newline at end of file
diff --git a/java/res/xml/kdb_turkish.xml b/java/res/xml/kdb_turkish.xml
deleted file mode 100644
index ba607a6c1..000000000
--- a/java/res/xml/kdb_turkish.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-/*
-**
-** Copyright 2011, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<Keyboard xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <include latin:keyboardLayout="@xml/rows_turkish" />
-</Keyboard>
\ No newline at end of file
diff --git a/java/res/xml/key_armenian_sha.xml b/java/res/xml/key_armenian_sha.xml
deleted file mode 100644
index 05779bb04..000000000
--- a/java/res/xml/key_armenian_sha.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2013, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <!-- U+0577: "շ" ARMENIAN SMALL LETTER SHA -->
-    <Key
-        latin:keySpec="&#x0577;" />
-</merge>
diff --git a/java/res/xml/key_armenian_xeh.xml b/java/res/xml/key_armenian_xeh.xml
deleted file mode 100644
index 72861c9ff..000000000
--- a/java/res/xml/key_armenian_xeh.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2013, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <!-- U+056D: "խ" ARMENIAN SMALL LETTER XEH -->
-    <Key
-        latin:keySpec="&#x056D;" />
-</merge>
diff --git a/java/res/xml/key_comma.xml b/java/res/xml/key_comma.xml
deleted file mode 100644
index a1da51713..000000000
--- a/java/res/xml/key_comma.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <switch>
-        <case
-            latin:keyboardLayoutSet="dvorak"
-        >
-            <Key
-                latin:keySpec="q"
-                latin:moreKeys="!text/morekeys_q,%"
-                latin:backgroundType="normal"
-                latin:keyStyle="settingsMoreKeysStyle" />
-        </case>
-        <case
-            latin:mode="url"
-        >
-            <Key
-                latin:keySpec="/"
-                latin:keyStyle="settingsMoreKeysStyle" />
-        </case>
-        <case
-            latin:mode="email"
-        >
-            <Key
-                latin:keySpec="\@"
-                latin:keyStyle="settingsMoreKeysStyle" />
-        </case>
-        <default>
-            <Key
-                latin:keySpec="!text/keyspec_comma"
-                latin:keyLabelFlags="hasPopupHint"
-                latin:keyStyle="settingsMoreKeysStyle" />
-        </default>
-    </switch>
-</merge>
diff --git a/java/res/xml/key_emoji.xml b/java/res/xml/key_emoji.xml
deleted file mode 100644
index 2d56c90a1..000000000
--- a/java/res/xml/key_emoji.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <switch>
-        <case
-            latin:mode="email|url"
-        >
-            <Key
-                latin:keyStyle="comKeyStyle"
-                latin:keyWidth="fillRight" />
-        </case>
-        <default>
-            <Key
-                latin:keyStyle="emojiKeyStyle"
-                latin:keyWidth="fillRight" />
-        </default>
-    </switch>
-</merge>
diff --git a/java/res/xml/key_period.xml b/java/res/xml/key_period.xml
deleted file mode 100644
index 9a138f218..000000000
--- a/java/res/xml/key_period.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2013, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <switch>
-        <case
-            latin:keyboardLayoutSet="dvorak"
-        >
-            <Key
-                latin:keySpec="z"
-                latin:keyLabelFlags="hasPopupHint"
-                latin:moreKeys="!text/morekeys_punctuation,!text/morekeys_z" />
-        </case>
-        <default>
-            <Key
-                latin:keySpec="!text/keyspec_period"
-                latin:keyHintLabel="!text/keyhintlabel_period"
-                latin:keyLabelFlags="hasPopupHint|hasShiftedLetterHint"
-                latin:moreKeys="!text/morekeys_period"
-                latin:backgroundType="functional" />
-        </default>
-    </switch>
-</merge>
diff --git a/java/res/xml/key_space_5kw.xml b/java/res/xml/key_space_5kw.xml
deleted file mode 100644
index 16dcfd6b0..000000000
--- a/java/res/xml/key_space_5kw.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <switch>
-        <case
-            latin:keyboardLayoutSet="bengali_akkhor|farsi|kannada|nepali_romanized|nepali_traditional|telugu"
-            latin:bottomEmojiKeyEnabled="true"
-        >
-            <Key
-                latin:keyStyle="bottomEmojiKeyStyle" />
-            <Key
-                latin:keyStyle="spaceKeyStyle"
-                latin:keyWidth="30%p" />
-            <Key
-                latin:keyStyle="zwnjKeyStyle" />
-        </case>
-        <case
-            latin:keyboardLayoutSet="bengali_akkhor|farsi|kannada|nepali_romanized|nepali_traditional|telugu"
-            latin:bottomEmojiKeyEnabled="false"
-        >
-            <Key
-                latin:keyStyle="spaceKeyStyle"
-                latin:keyWidth="40%p" />
-            <Key
-                latin:keyStyle="zwnjKeyStyle" />
-        </case>
-        <case
-            latin:bottomEmojiKeyEnabled="true"
-        >
-            <Key
-                latin:keyStyle="bottomEmojiKeyStyle" />
-            <Key
-                latin:keyStyle="spaceKeyStyle"
-                latin:keyWidth="40%p" />
-        </case>
-        <!-- bottomEmojiKeyEnabled="false" -->
-        <default>
-            <Key
-                latin:keyStyle="spaceKeyStyle"
-                latin:keyWidth="50%p" />
-        </default>
-    </switch>
-</merge>
diff --git a/java/res/xml/key_space_symbols.xml b/java/res/xml/key_space_symbols.xml
deleted file mode 100644
index d84783d3a..000000000
--- a/java/res/xml/key_space_symbols.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <Key
-        latin:keyStyle="spaceKeyStyle"
-        latin:keyWidth="30%p" />
-</merge>
diff --git a/java/res/xml/key_styles_actions.xml b/java/res/xml/key_styles_actions.xml
deleted file mode 100644
index b35391ae1..000000000
--- a/java/res/xml/key_styles_actions.xml
+++ /dev/null
@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2014, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <!-- Go key -->
-    <switch>
-        <case latin:isIconDefined="go_key">
-            <key-style
-                latin:styleName="goActionKeyStyle"
-                latin:keySpec="!icon/go_key|!code/key_enter"
-                latin:parentStyle="defaultEnterKeyStyle" />
-        </case>
-        <default>
-            <key-style
-                latin:styleName="goActionKeyStyle"
-                latin:keySpec="!text/label_go_key|!code/key_enter"
-                latin:parentStyle="defaultEnterKeyStyle" />
-        </default>
-    </switch>
-    <!-- Next key -->
-    <switch>
-        <case latin:isIconDefined="next_key">
-            <key-style
-                latin:styleName="nextActionKeyStyle"
-                latin:keySpec="!icon/next_key|!code/key_enter"
-                latin:parentStyle="defaultEnterKeyStyle" />
-        </case>
-        <default>
-            <key-style
-                latin:styleName="nextActionKeyStyle"
-                latin:keySpec="!text/label_next_key|!code/key_enter"
-                latin:parentStyle="defaultEnterKeyStyle" />
-        </default>
-    </switch>
-    <!-- Previous key -->
-    <switch>
-        <case latin:isIconDefined="previous_key">
-            <key-style
-                latin:styleName="previousActionKeyStyle"
-                latin:keySpec="!icon/previous_key|!code/key_enter"
-                latin:parentStyle="defaultEnterKeyStyle" />
-        </case>
-        <default>
-            <key-style
-                latin:styleName="previousActionKeyStyle"
-                latin:keySpec="!text/label_previous_key|!code/key_enter"
-                latin:parentStyle="defaultEnterKeyStyle" />
-        </default>
-    </switch>
-    <!-- Done key -->
-    <switch>
-        <case latin:isIconDefined="done_key">
-            <key-style
-                latin:styleName="doneActionKeyStyle"
-                latin:keySpec="!icon/done_key|!code/key_enter"
-                latin:parentStyle="defaultEnterKeyStyle" />
-        </case>
-        <default>
-            <key-style
-                latin:styleName="doneActionKeyStyle"
-                latin:keySpec="!text/label_done_key|!code/key_enter"
-                latin:parentStyle="defaultEnterKeyStyle" />
-        </default>
-    </switch>
-    <!-- Send key -->
-    <switch>
-        <case latin:isIconDefined="send_key">
-            <key-style
-                latin:styleName="sendActionKeyStyle"
-                latin:keySpec="!icon/send_key|!code/key_enter"
-                latin:parentStyle="defaultEnterKeyStyle" />
-        </case>
-        <default>
-            <key-style
-                latin:styleName="sendActionKeyStyle"
-                latin:keySpec="!text/label_send_key|!code/key_enter"
-                latin:parentStyle="defaultEnterKeyStyle" />
-        </default>
-    </switch>
-    <!-- Seartch key -->
-    <switch>
-        <case latin:isIconDefined="search_key">
-            <key-style
-                latin:styleName="searchActionKeyStyle"
-                latin:keySpec="!icon/search_key|!code/key_enter"
-                latin:parentStyle="defaultEnterKeyStyle" />
-        </case>
-        <default>
-            <key-style
-                latin:styleName="searchActionKeyStyle"
-                latin:keySpec="!text/label_search_key|!code/key_enter"
-                latin:parentStyle="defaultEnterKeyStyle" />
-        </default>
-    </switch>
-    <switch>
-        <case latin:keyboardTheme="ICS|KLP">
-            <key-style
-                latin:styleName="customLabelActionKeyStyle"
-                latin:keySpec="dummy_label|!code/key_enter"
-                latin:keyLabelFlags="fromCustomActionLabel"
-                latin:backgroundType="action"
-                latin:parentStyle="defaultEnterKeyStyle" />
-        </case>
-        <!-- keyboardTheme="LXXLight|LXXDark" -->
-        <default>
-            <key-style
-                latin:styleName="customLabelActionKeyStyle"
-                latin:keySpec="dummy_label|!code/key_enter"
-                latin:keyLabelFlags="fromCustomActionLabel"
-                latin:backgroundType="functional"
-                latin:parentStyle="defaultEnterKeyStyle" />
-        </default>
-    </switch>
-</merge>
diff --git a/java/res/xml/key_styles_common.xml b/java/res/xml/key_styles_common.xml
deleted file mode 100644
index 66b32eaf6..000000000
--- a/java/res/xml/key_styles_common.xml
+++ /dev/null
@@ -1,145 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2010, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <switch>
-        <case
-            latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLockShifted"
-        >
-            <key-style
-                latin:styleName="hasShiftedLetterHintStyle"
-                latin:keyLabelFlags="hasShiftedLetterHint|shiftedLetterActivated" />
-        </case>
-        <default>
-            <key-style
-                latin:styleName="hasShiftedLetterHintStyle"
-                latin:keyLabelFlags="hasShiftedLetterHint" />
-        </default>
-    </switch>
-    <include
-        latin:keyboardLayout="@xml/key_styles_settings" />
-    <!-- Functional key styles -->
-    <!-- Base style for shift key. A single space is used for base label in moreKeys. -->
-    <key-style
-        latin:styleName="baseForShiftKeyStyle"
-        latin:keyActionFlags="noKeyPreview"
-        latin:keyLabelFlags="preserveCase|disableKeyHintLabel"
-        latin:moreKeys="!noPanelAutoMoreKey!, |!code/key_capslock" />
-    <switch>
-        <case
-            latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetAutomaticShifted"
-        >
-            <key-style
-                latin:styleName="shiftKeyStyle"
-                latin:keySpec="!icon/shift_key_shifted|!code/key_shift"
-                latin:backgroundType="stickyOff"
-                latin:parentStyle="baseForShiftKeyStyle" />
-        </case>
-        <case
-            latin:keyboardLayoutSetElement="alphabetShiftLocked|alphabetShiftLockShifted"
-        >
-            <key-style
-                latin:styleName="shiftKeyStyle"
-                latin:keySpec="!icon/shift_key_shifted|!code/key_shift"
-                latin:backgroundType="stickyOn"
-                latin:parentStyle="baseForShiftKeyStyle" />
-        </case>
-        <default>
-            <key-style
-                latin:styleName="shiftKeyStyle"
-                latin:keySpec="!icon/shift_key|!code/key_shift"
-                latin:backgroundType="stickyOff"
-                latin:parentStyle="baseForShiftKeyStyle" />
-        </default>
-    </switch>
-    <key-style
-        latin:styleName="deleteKeyStyle"
-        latin:keySpec="!icon/delete_key|!code/key_delete"
-        latin:keyActionFlags="isRepeatable|noKeyPreview"
-        latin:keyLabelFlags="disableKeyHintLabel"
-        latin:backgroundType="functional" />
-    <!-- emojiKeyStyle must be defined before including @xml/key_syles_enter. -->
-    <key-style
-        latin:styleName="emojiKeyStyle"
-        latin:keySpec="!icon/emoji_action_key|!code/key_emoji"
-        latin:keyActionFlags="noKeyPreview"
-        latin:backgroundType="action" />
-    <include
-        latin:keyboardLayout="@xml/key_styles_enter" />
-    <!-- TODO: Currently there is no way to specify icon alignment per theme. -->
-    <key-style
-        latin:styleName="spaceKeyStyle"
-        latin:keySpec="!icon/space_key|!code/key_space"
-        latin:backgroundType="spacebar"
-        latin:keyLabelFlags="disableKeyHintLabel"
-        latin:keyActionFlags="noKeyPreview|enableLongPress" />
-    <!-- U+200C: ZERO WIDTH NON-JOINER
-         U+200D: ZERO WIDTH JOINER -->
-    <key-style
-        latin:styleName="zwnjKeyStyle"
-        latin:keySpec="!icon/zwnj_key|&#x200C;"
-        latin:moreKeys="!icon/zwj_key|&#x200D;"
-        latin:keyLabelFlags="hasPopupHint"
-        latin:keyActionFlags="noKeyPreview" />
-    <key-style
-        latin:styleName="settingsKeyStyle"
-        latin:keySpec="!icon/settings_key|!code/key_settings"
-        latin:keyActionFlags="noKeyPreview|altCodeWhileTyping"
-        latin:altCode="!code/key_space"
-        latin:backgroundType="functional" />
-    <key-style
-        latin:styleName="tabKeyStyle"
-        latin:keySpec="!icon/tab_key|!code/key_tab"
-        latin:backgroundType="functional" />
-    <!-- Note: This key style is not for functional tab key. This is used for the tab key which is
-         laid out as normal letter key. -->
-    <key-style
-        latin:styleName="nonSpecialBackgroundTabKeyStyle"
-        latin:keySpec="!icon/tab_key|!code/key_tab" />
-    <key-style
-        latin:styleName="baseForLayoutSwitchKeyStyle"
-        latin:keyLabelFlags="preserveCase|followFunctionalTextColor"
-        latin:keyActionFlags="noKeyPreview"
-        latin:backgroundType="functional" />
-    <key-style
-        latin:styleName="toSymbolKeyStyle"
-        latin:keySpec="!text/keylabel_to_symbol|!code/key_switch_alpha_symbol"
-        latin:parentStyle="baseForLayoutSwitchKeyStyle" />
-    <key-style
-        latin:styleName="toAlphaKeyStyle"
-        latin:keySpec="!text/keylabel_to_alpha|!code/key_switch_alpha_symbol"
-        latin:parentStyle="baseForLayoutSwitchKeyStyle" />
-    <key-style
-        latin:styleName="toMoreSymbolKeyStyle"
-        latin:keySpec="!text/keylabel_to_more_symbol|!code/key_shift"
-        latin:parentStyle="baseForLayoutSwitchKeyStyle" />
-    <key-style
-        latin:styleName="backFromMoreSymbolKeyStyle"
-        latin:keySpec="!text/keylabel_to_symbol|!code/key_shift"
-        latin:parentStyle="baseForLayoutSwitchKeyStyle" />
-    <key-style
-        latin:styleName="comKeyStyle"
-        latin:keySpec="!text/keyspec_popular_domain"
-        latin:keyLabelFlags="autoXScale|fontNormal|hasPopupHint|preserveCase"
-        latin:moreKeys="!text/morekeys_popular_domain"
-        latin:backgroundType="functional" />
-</merge>
diff --git a/java/res/xml/key_styles_currency.xml b/java/res/xml/key_styles_currency.xml
deleted file mode 100644
index 22451c302..000000000
--- a/java/res/xml/key_styles_currency.xml
+++ /dev/null
@@ -1,167 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2011, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <switch>
-        <case latin:passwordInput="true">
-            <include latin:keyboardLayout="@xml/key_styles_currency_dollar" />
-        </case>
-        <!-- Countries using Euro currency, 23 countries as of November 2012.
-              1. Andorra (ca_AD, ca_ES)
-              2. Austria (de_AT)
-              3. Belgium (nl_BE, fr_BE, de_BE)
-              4. Cyprus (el_CY, tr_CY)
-              5. Estonia (et_EE)
-              6. Finland (fi_FI, sv_FI)
-              7. France (fr_FR)
-              8. Germany (de_DE)
-              9. Greece (el_GR)
-             10. Ireland (ga_IE, en_IE)
-             11. Italy (it_IT)
-             12. Kosovo (sq_XK, sr_XK)
-             13. Luxembourg (lb_LU, fr_LU, de_LU)
-             14. Malta (mt_MT, en_MT)
-             15. Monaco (fr_MO)
-             16. Montenegro (??_ME)
-             17. Netherlands (nl_NL)
-             18. Portugal (pt_PT)
-             19. San Marino (it_SM)
-             20. Slovakia (sk_SK)
-             21. Slovenia (sl_SI)
-             22. Spain (es_ES, ca_ES, eu_ES, gl_ES)
-             23. Vatican City (it_VA) -->
-        <case latin:countryCode="AD|AT|BE|CY|EE|FI|FR|DE|GR|IE|IT|XK|LU|MT|MO|ME|NL|PT|SM|SK|SI|ES|VA">
-            <include latin:keyboardLayout="@xml/key_styles_currency_euro" />
-        </case>
-        <!-- Note: Some subtype locale may not have country code, and it it supposed to indicate the
-             country where the language originally/mainly spoken. -->
-        <!-- Though Denmark, Sweden and Turkey don't use Euro as their currency, having the Euro
-             sign on the symbol keyboard might be useful.  Especially Danish krone (kr), Swedish
-             krona (kr) and Turkish lira (TL) can be represented by usual alphabet letters. -->
-        <!-- TODO: The currency sign of Turkish Lira was created in 2012 and assigned U+20BA for
-             its unicode, although there is no font glyph for it as of November 2012. -->
-        <!-- da: Denmark (da_DK)
-             de: Germany (de_DE)
-             es: Spain (es_ES)
-             fi: Finland (fi_FI)
-             fr: France(fr_FR)
-             it: Italy (it_IT)
-             nl: Netherlands (nl_NL)
-             sk: Slovakia (sk_SK)
-             sl: Slovenia (sl_SL)
-             sv: Sweden (sv_SV)
-             tr: Trukey (tr_TR) -->
-        <case latin:localeCode="da|de|es|el|fi|fr|it|nl|sk|sl|sv|tr">
-            <include latin:keyboardLayout="@xml/key_styles_currency_euro" />
-        </case>
-        <!-- ca: Catalan (Andorra, Spain)
-             et: Estonian (Estonia)
-             lb: Luxembougish (Luxembourg)
-             mt: Maltese (Malta) -->
-        <case latin:languageCode="ca|et|lb|mt">
-            <include latin:keyboardLayout="@xml/key_styles_currency_euro" />
-        </case>
-        <!-- fa: Persian (Rial and Afgahni)
-             hi: Hindi (Indian Rupee)
-             hi_ZZ: Hinglish (Indian Rupee)
-             iw: Hebrew (New Sheqel)
-             lo: Lao (Kip)
-             mn: Mongolian (Tugrik)
-             ne: Nepali (Nepalese Rupee)
-             th: Thai (Baht)
-             uk: Ukrainian (Hryvnia)
-             vi: Vietnamese (Dong)  -->
-        <!-- TODO: The currency sign of Turkish Lira was created in 2012 and assigned U+20BA for
-             its unicode, although there is no font glyph for it as of November 2012. -->
-        <!-- TODO: The currency sign of Armenian Dram was created in 2012 and assigned U+058F for
-             its unicode, although there is no font glyph for it as of September 2013. -->
-        <!-- TODO: The currency sign of Russian Ruble was created in 2014 and assigned U+20BD for
-             its unicode, although there is no font glyph for it as of August 2014. -->
-        <case latin:languageCode="fa|hi|iw|lo|mn|ne|th|uk|vi">
-            <include latin:keyboardLayout="@xml/key_styles_currency_generic" />
-        </case>
-        <!-- si_LK: Sinhala (Sri Lanka) (Sri Lanka Rupee)
-             ta_LK: Tamil (Sri Lanka) (Sri Lanka Rupee)
-             bn_BD: Bengali (Bangladesh) (Taka) -->
-        <case latin:countryCode="LK|BD">
-            <include latin:keyboardLayout="@xml/key_styles_currency_generic" />
-        </case>
-        <!-- bn_IN: Bengali (India) (Indian Rupee)
-             en_IN: English (India) (Indian Rupee)
-             kn_IN: Kannada (India) (Indian Rupee)
-             ml_IN: Malayalam (India) (Indian Rupee)
-             mr_IN: Marathi (India) (Indian Rupee)
-             ta_IN: Tamil (India) (Indian Rupee)
-             te_IN: Telugu (India) (Indian Rupee)
-         -->
-        <case latin:countryCode="IN">
-            <!-- U+20B9: "₹" INDIAN RUPEE SIGN
-                 U+00A3: "£" POUND SIGN
-                 U+20AC: "€" EURO SIGN
-                 U+00A2: "¢" CENT SIGN -->
-            <key-style
-                latin:styleName="currencyKeyStyle"
-                latin:keySpec="&#x20B9;"
-                latin:moreKeys="!text/morekeys_currency_generic" />
-            <key-style
-                latin:styleName="moreCurrency1KeyStyle"
-                latin:keySpec="&#x00A3;" />
-            <key-style
-                latin:styleName="moreCurrency2KeyStyle"
-                latin:keySpec="&#x20AC;" />
-            <key-style
-                latin:styleName="moreCurrency3KeyStyle"
-                latin:keySpec="$"
-                latin:moreKeys="&#x00A2;" />
-            <key-style
-                latin:styleName="moreCurrency4KeyStyle"
-                latin:keySpec="&#x00A2;" />
-        </case>
-        <!-- GB: United Kingdom (Pound) -->
-        <case latin:countryCode="GB">
-            <!-- U+00A3: "£" POUND SIGN
-                 U+20AC: "€" EURO SIGN
-                 U+00A5: "¥" YEN SIGN
-                 U+00A2: "¢" CENT SIGN
-                 U+20B1: "₱" PESO SIGN -->
-            <key-style
-                latin:styleName="currencyKeyStyle"
-                latin:keySpec="&#x00A3;"
-                latin:moreKeys="&#x00A2;,$,&#x20AC;,&#x00A5;,&#x20B1;" />
-            <key-style
-                latin:styleName="moreCurrency1KeyStyle"
-                latin:keySpec="&#x20AC;" />
-            <key-style
-                latin:styleName="moreCurrency2KeyStyle"
-                latin:keySpec="&#x00A5;" />
-            <key-style
-                latin:styleName="moreCurrency3KeyStyle"
-                latin:keySpec="$"
-                latin:moreKeys="&#x00A2;" />
-            <key-style
-                latin:styleName="moreCurrency4KeyStyle"
-                latin:keySpec="&#x00A2;" />
-        </case>
-        <!-- ar: Arabic (Dollar and Rial) -->
-        <default>
-            <include latin:keyboardLayout="@xml/key_styles_currency_dollar" />
-        </default>
-    </switch>
-</merge>
diff --git a/java/res/xml/key_styles_currency_dollar.xml b/java/res/xml/key_styles_currency_dollar.xml
deleted file mode 100644
index 9a2f1d005..000000000
--- a/java/res/xml/key_styles_currency_dollar.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2011, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <!-- U+00A3: "£" POUND SIGN
-         U+00A2: "¢" CENT SIGN
-         U+20AC: "€" EURO SIGN
-         U+00A5: "¥" YEN SIGN -->
-    <key-style
-        latin:styleName="currencyKeyStyle"
-        latin:keySpec="$"
-        latin:moreKeys="!text/morekeys_currency_dollar" />
-    <key-style
-        latin:styleName="moreCurrency1KeyStyle"
-        latin:keySpec="&#x00A3;" />
-    <key-style
-        latin:styleName="moreCurrency2KeyStyle"
-        latin:keySpec="&#x00A2;" />
-    <key-style
-        latin:styleName="moreCurrency3KeyStyle"
-        latin:keySpec="&#x20AC;" />
-    <key-style
-        latin:styleName="moreCurrency4KeyStyle"
-        latin:keySpec="&#x00A5;" />
-</merge>
diff --git a/java/res/xml/key_styles_currency_euro.xml b/java/res/xml/key_styles_currency_euro.xml
deleted file mode 100644
index dfae2017f..000000000
--- a/java/res/xml/key_styles_currency_euro.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2011, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <!-- U+20AC: "€" EURO SIGN
-         U+00A2: "¢" CENT SIGN
-         U+00A3: "£" POUND SIGN
-         U+00A5: "¥" YEN SIGN
-         U+20B1: "₱" PESO SIGN -->
-    <key-style
-        latin:styleName="currencyKeyStyle"
-        latin:keySpec="&#x20AC;"
-        latin:moreKeys="&#x00A2;,&#x00A3;,$,&#x00A5;,&#x20B1;" />
-    <key-style
-        latin:styleName="moreCurrency1KeyStyle"
-        latin:keySpec="&#x00A3;" />
-    <key-style
-        latin:styleName="moreCurrency2KeyStyle"
-        latin:keySpec="&#x00A5;" />
-    <key-style
-        latin:styleName="moreCurrency3KeyStyle"
-        latin:keySpec="$"
-        latin:moreKeys="&#x00A2;" />
-    <key-style
-        latin:styleName="moreCurrency4KeyStyle"
-        latin:keySpec="&#x00A2;" />
-</merge>
diff --git a/java/res/xml/key_styles_currency_generic.xml b/java/res/xml/key_styles_currency_generic.xml
deleted file mode 100644
index 2f005255a..000000000
--- a/java/res/xml/key_styles_currency_generic.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2014, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <!-- U+00A3: "£" POUND SIGN
-         U+20AC: "€" EURO SIGN
-         U+00A2: "¢" CENT SIGN -->
-    <key-style
-        latin:styleName="currencyKeyStyle"
-        latin:keySpec="!text/keyspec_currency"
-        latin:moreKeys="!text/morekeys_currency_generic" />
-    <key-style
-        latin:styleName="moreCurrency1KeyStyle"
-        latin:keySpec="&#x00A3;" />
-    <key-style
-        latin:styleName="moreCurrency2KeyStyle"
-        latin:keySpec="&#x20AC;" />
-    <key-style
-        latin:styleName="moreCurrency3KeyStyle"
-        latin:keySpec="$"
-        latin:moreKeys="&#x00A2;" />
-    <key-style
-        latin:styleName="moreCurrency4KeyStyle"
-        latin:keySpec="&#x00A2;" />
-</merge>
diff --git a/java/res/xml/key_styles_enter.xml b/java/res/xml/key_styles_enter.xml
deleted file mode 100644
index 71727c864..000000000
--- a/java/res/xml/key_styles_enter.xml
+++ /dev/null
@@ -1,313 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <!-- Navigate more keys style -->
-    <include latin:keyboardLayout="@xml/key_styles_navigate_more_keys" />
-    <switch>
-        <!-- latin:passwordInput="true" -->
-        <case
-            latin:imeAction="actionNext"
-            latin:navigatePrevious="true"
-            latin:passwordInput="true"
-        >
-            <key-style
-                latin:styleName="navigateMoreKeysStyle"
-                latin:parentStyle="navigatePreviousMoreKeysStyle" />
-        </case>
-        <case
-            latin:imeAction="actionNext"
-            latin:passwordInput="true"
-        >
-            <key-style
-                latin:styleName="navigateMoreKeysStyle" />
-        </case>
-        <case
-            latin:imeAction="actionPrevious"
-            latin:navigateNext="true"
-            latin:passwordInput="true"
-        >
-            <key-style
-                latin:styleName="navigateMoreKeysStyle"
-                latin:parentStyle="navigateNextMoreKeysStyle" />
-        </case>
-        <case
-            latin:imeAction="actionPrevious"
-            latin:passwordInput="true"
-        >
-            <key-style
-                latin:styleName="navigateMoreKeysStyle" />
-        </case>
-        <case
-            latin:navigateNext="true"
-            latin:navigatePrevious="true"
-            latin:passwordInput="true"
-        >
-            <key-style
-                latin:styleName="navigateMoreKeysStyle"
-                latin:parentStyle="navigatePreviousNextMoreKeysStyle" />
-        </case>
-        <case
-            latin:navigateNext="true"
-            latin:passwordInput="true"
-        >
-            <key-style
-                latin:styleName="navigateMoreKeysStyle"
-                latin:parentStyle="navigateNextMoreKeysStyle" />
-        </case>
-        <case
-            latin:navigatePrevious="true"
-            latin:passwordInput="true"
-        >
-            <key-style
-                latin:styleName="navigateMoreKeysStyle"
-                latin:parentStyle="navigatePreviousMoreKeysStyle" />
-        </case>
-        <case
-            latin:passwordInput="true"
-        >
-            <key-style
-                latin:styleName="navigateMoreKeysStyle" />
-        </case>
-        <!-- latin:mode="email|url|phone|number|date|time|datetime" -->
-        <case
-            latin:imeAction="actionNext"
-            latin:navigatePrevious="true"
-            latin:mode="email|url|phone|number|date|time|datetime"
-        >
-            <key-style
-                latin:styleName="navigateMoreKeysStyle"
-                latin:parentStyle="navigatePreviousMoreKeysStyle" />
-        </case>
-        <case
-            latin:imeAction="actionNext"
-            latin:mode="email|url|phone|number|date|time|datetime"
-        >
-            <key-style
-                latin:styleName="navigateMoreKeysStyle" />
-        </case>
-        <case
-            latin:imeAction="actionPrevious"
-            latin:navigateNext="true"
-            latin:mode="email|url|phone|number|date|time|datetime"
-        >
-            <key-style
-                latin:styleName="navigateMoreKeysStyle"
-                latin:parentStyle="navigateNextMoreKeysStyle" />
-        </case>
-        <case
-            latin:imeAction="actionPrevious"
-            latin:mode="email|url|phone|number|date|time|datetime"
-        >
-            <key-style
-                latin:styleName="navigateMoreKeysStyle" />
-        </case>
-        <case
-            latin:navigateNext="true"
-            latin:navigatePrevious="true"
-            latin:mode="email|url|phone|number|date|time|datetime"
-        >
-            <key-style
-                latin:styleName="navigateMoreKeysStyle"
-                latin:parentStyle="navigatePreviousNextMoreKeysStyle" />
-        </case>
-        <case
-            latin:navigateNext="true"
-            latin:mode="email|url|phone|number|date|time|datetime"
-        >
-            <key-style
-                latin:styleName="navigateMoreKeysStyle"
-                latin:parentStyle="navigateNextMoreKeysStyle" />
-        </case>
-        <case
-            latin:navigatePrevious="true"
-            latin:mode="email|url|phone|number|date|time|datetime"
-        >
-            <key-style
-                latin:styleName="navigateMoreKeysStyle"
-                latin:parentStyle="navigatePreviousMoreKeysStyle" />
-        </case>
-        <case
-            latin:mode="email|url|phone|number|date|time|datetime"
-        >
-            <key-style
-                latin:styleName="navigateMoreKeysStyle" />
-        </case>
-        <!-- default -->
-        <case
-            latin:imeAction="actionNext"
-            latin:navigatePrevious="true"
-        >
-            <key-style
-                latin:styleName="navigateMoreKeysStyle"
-                latin:parentStyle="navigateEmojiPreviousMoreKeysStyle" />
-        </case>
-        <case
-            latin:imeAction="actionNext"
-        >
-            <key-style
-                latin:styleName="navigateMoreKeysStyle"
-                latin:parentStyle="navigateEmojiMoreKeysStyle" />
-        </case>
-        <case
-            latin:imeAction="actionPrevious"
-            latin:navigateNext="true"
-        >
-            <key-style
-                latin:styleName="navigateMoreKeysStyle"
-                latin:parentStyle="navigateEmojiNextMoreKeysStyle" />
-        </case>
-        <case
-            latin:imeAction="actionPrevious"
-        >
-            <key-style
-                latin:styleName="navigateMoreKeysStyle"
-                latin:parentStyle="navigateEmojiMoreKeysStyle" />
-        </case>
-        <case
-            latin:navigateNext="true"
-            latin:navigatePrevious="true"
-        >
-            <key-style
-                latin:styleName="navigateMoreKeysStyle"
-                latin:parentStyle="navigateEmojiPreviousNextMoreKeysStyle" />
-        </case>
-        <case
-            latin:navigateNext="true"
-        >
-            <key-style
-                latin:styleName="navigateMoreKeysStyle"
-                latin:parentStyle="navigateEmojiNextMoreKeysStyle" />
-        </case>
-        <case
-            latin:navigatePrevious="true"
-        >
-            <key-style
-                latin:styleName="navigateMoreKeysStyle"
-                latin:parentStyle="navigateEmojiPreviousMoreKeysStyle" />
-        </case>
-        <default>
-            <key-style
-                latin:styleName="navigateMoreKeysStyle"
-                latin:parentStyle="navigateEmojiMoreKeysStyle" />
-        </default>
-    </switch>
-    <!-- Enter key style -->
-    <switch>
-        <case latin:keyboardTheme="ICS|KLP">
-            <key-style
-                latin:styleName="defaultEnterKeyStyle"
-                latin:keySpec="!icon/enter_key|!code/key_enter"
-                latin:keyLabelFlags="preserveCase|autoXScale|followKeyLabelRatio|followFunctionalTextColor|disableKeyHintLabel"
-                latin:keyActionFlags="noKeyPreview"
-                latin:backgroundType="action"
-                latin:parentStyle="navigateMoreKeysStyle" />
-        </case>
-        <!-- keyboardTheme="LXXLight|LXXDark" -->
-        <default>
-            <key-style
-                latin:styleName="defaultEnterKeyStyle"
-                latin:keySpec="!icon/enter_key|!code/key_enter"
-                latin:keyLabelFlags="preserveCase|autoXScale|followKeyLabelRatio|followFunctionalTextColor|disableKeyHintLabel"
-                latin:keyActionFlags="noKeyPreview"
-                latin:backgroundType="action"
-                latin:parentStyle="navigateMoreKeysStyle" />
-        </default>
-    </switch>
-    <include latin:keyboardLayout="@xml/key_styles_actions" />
-    <switch>
-        <!-- Shift + Enter in textMultiLine field. -->
-        <case
-            latin:isMultiLine="true"
-            latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLockShifted"
-        >
-            <key-style
-                latin:styleName="enterKeyStyle"
-                latin:keySpec="!icon/enter_key|!code/key_shift_enter"
-                latin:parentStyle="defaultEnterKeyStyle" />
-        </case>
-        <!-- Smiley in textShortMessage field.
-             This <case> should be after Shift + Enter <case> and before any of action <case>. -->
-        <!--<case
-            latin:mode="im"
-        >
-            <key-style
-                latin:styleName="enterKeyStyle"
-                latin:parentStyle="emojiKeyStyle" />
-        </case>-->
-        <case
-            latin:imeAction="actionGo"
-        >
-            <key-style
-                latin:styleName="enterKeyStyle"
-                latin:parentStyle="goActionKeyStyle" />
-        </case>
-        <case
-            latin:imeAction="actionNext"
-        >
-            <key-style
-                latin:styleName="enterKeyStyle"
-                latin:parentStyle="nextActionKeyStyle" />
-        </case>
-        <case
-            latin:imeAction="actionPrevious"
-        >
-            <key-style
-                latin:styleName="enterKeyStyle"
-                latin:parentStyle="previousActionKeyStyle" />
-        </case>
-        <case
-            latin:imeAction="actionDone"
-        >
-            <key-style
-                latin:styleName="enterKeyStyle"
-                latin:parentStyle="doneActionKeyStyle" />
-        </case>
-        <case
-            latin:imeAction="actionSend"
-        >
-            <key-style
-                latin:styleName="enterKeyStyle"
-                latin:parentStyle="sendActionKeyStyle" />
-        </case>
-        <case
-            latin:imeAction="actionSearch"
-        >
-            <key-style
-                latin:styleName="enterKeyStyle"
-                latin:parentStyle="searchActionKeyStyle" />
-        </case>
-        <case
-            latin:imeAction="actionCustomLabel"
-        >
-            <key-style
-                latin:styleName="enterKeyStyle"
-                latin:parentStyle="customLabelActionKeyStyle" />
-        </case>
-        <!-- imeAction is either actionNone or actionUnspecified. -->
-        <default>
-            <key-style
-                latin:styleName="enterKeyStyle"
-                latin:parentStyle="defaultEnterKeyStyle" />
-        </default>
-    </switch>
-</merge>
diff --git a/java/res/xml/key_styles_less_greater.xml b/java/res/xml/key_styles_less_greater.xml
deleted file mode 100644
index 716838b0b..000000000
--- a/java/res/xml/key_styles_less_greater.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <!-- The less and greater keys' style which may have different label depending on locale. -->
-    <!-- Kept as a separate file for cleaner overriding by an overlay.  -->
-    <switch>
-        <case
-            latin:languageCode="fa"
-        >
-            <key-style
-                latin:styleName="lessKeyStyle"
-                latin:keySpec="!text/keyspec_left_double_angle_quote"
-                latin:backgroundType="functional"
-                latin:moreKeys="!text/morekeys_less_than" />
-            <key-style
-                latin:styleName="greaterKeyStyle"
-                latin:keySpec="!text/keyspec_right_double_angle_quote"
-                latin:backgroundType="functional"
-                latin:moreKeys="!text/morekeys_greater_than" />
-        </case>
-        <default>
-            <key-style
-                latin:styleName="lessKeyStyle"
-                latin:keySpec="!text/keyspec_less_than"
-                latin:backgroundType="functional"
-                latin:moreKeys="!text/morekeys_less_than" />
-            <key-style
-                latin:styleName="greaterKeyStyle"
-                latin:keySpec="!text/keyspec_greater_than"
-                latin:backgroundType="functional"
-                latin:moreKeys="!text/morekeys_greater_than" />
-        </default>
-    </switch>
-</merge>
diff --git a/java/res/xml/key_styles_navigate_more_keys.xml b/java/res/xml/key_styles_navigate_more_keys.xml
deleted file mode 100644
index 67230e126..000000000
--- a/java/res/xml/key_styles_navigate_more_keys.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2014, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <switch>
-        <case latin:keyboardTheme="ICS|KLP">
-            <key-style
-                latin:styleName="navigateNextMoreKeysStyle"
-                latin:keyLabelFlags="hasPopupHint|preserveCase"
-                latin:moreKeys="!text/keyspec_action_next" />
-            <key-style
-                latin:styleName="navigatePreviousMoreKeysStyle"
-                latin:keyLabelFlags="hasPopupHint|preserveCase"
-                latin:moreKeys="!text/keyspec_action_previous" />
-            <key-style
-                latin:styleName="navigatePreviousNextMoreKeysStyle"
-                latin:keyLabelFlags="hasPopupHint|preserveCase"
-                latin:moreKeys="!fixedColumnOrder!2,!needsDividers!,!text/keyspec_action_previous,!text/keyspec_action_next" />
-            <key-style
-                latin:styleName="navigateEmojiMoreKeysStyle"
-                latin:keyLabelFlags="hasPopupHint|preserveCase"
-                latin:moreKeys="!text/keyspec_emoji_action_key" />
-            <key-style
-                latin:styleName="navigateEmojiNextMoreKeysStyle"
-                latin:keyLabelFlags="hasPopupHint|preserveCase"
-                latin:moreKeys="!fixedColumnOrder!2,!needsDividers!,!text/keyspec_emoji_action_key,!text/keyspec_action_next" />
-            <key-style
-                latin:styleName="navigateEmojiPreviousMoreKeysStyle"
-                latin:keyLabelFlags="hasPopupHint|preserveCase"
-                latin:moreKeys="!fixedColumnOrder!2,!needsDividers!,!text/keyspec_emoji_action_key,!text/keyspec_action_previous" />
-            <key-style
-                latin:styleName="navigateEmojiPreviousNextMoreKeysStyle"
-                latin:keyLabelFlags="hasPopupHint|preserveCase"
-                latin:moreKeys="!fixedColumnOrder!3,!needsDividers!,!text/keyspec_emoji_action_key,!text/keyspec_action_previous,!text/keyspec_action_next" />
-        </case>
-        <default>
-            <key-style
-                latin:styleName="navigateNextMoreKeysStyle"
-                latin:keyLabelFlags="hasPopupHint|preserveCase"
-                latin:moreKeys="!icon/next_key|!code/key_action_next" />
-            <key-style
-                latin:styleName="navigatePreviousMoreKeysStyle"
-                latin:keyLabelFlags="hasPopupHint|preserveCase"
-                latin:moreKeys="!icon/previous_key|!code/key_action_previous" />
-            <key-style
-                latin:styleName="navigatePreviousNextMoreKeysStyle"
-                latin:keyLabelFlags="hasPopupHint|preserveCase"
-                latin:moreKeys="!fixedColumnOrder!2,!needsDividers!,!icon/previous_key|!code/key_action_previous,!icon/next_key|!code/key_action_next" />
-            <key-style
-                latin:styleName="navigateEmojiMoreKeysStyle"
-                latin:keyLabelFlags="hasPopupHint|preserveCase"
-                latin:moreKeys="!text/keyspec_emoji_action_key" />
-            <key-style
-                latin:styleName="navigateEmojiNextMoreKeysStyle"
-                latin:keyLabelFlags="hasPopupHint|preserveCase"
-                latin:moreKeys="!fixedColumnOrder!2,!needsDividers!,!text/keyspec_emoji_action_key,!icon/next_key|!code/key_action_next" />
-            <key-style
-                latin:styleName="navigateEmojiPreviousMoreKeysStyle"
-                latin:keyLabelFlags="hasPopupHint|preserveCase"
-                latin:moreKeys="!fixedColumnOrder!2,!needsDividers!,!text/keyspec_emoji_action_key,!icon/previous_key|!code/key_action_previous" />
-            <key-style
-                latin:styleName="navigateEmojiPreviousNextMoreKeysStyle"
-                latin:keyLabelFlags="hasPopupHint|preserveCase"
-                latin:moreKeys="!fixedColumnOrder!3,!needsDividers!,!text/keyspec_emoji_action_key,!icon/previous_key|!code/key_action_previous,!icon/next_key|!code/key_action_next" />
-        </default>
-    </switch>
-</merge>
diff --git a/java/res/xml/key_styles_number.xml b/java/res/xml/key_styles_number.xml
deleted file mode 100644
index b670998c6..000000000
--- a/java/res/xml/key_styles_number.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2010, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <key-style
-        latin:styleName="numKeyBaseStyle"
-        latin:keyActionFlags="noKeyPreview" />
-    <key-style
-        latin:styleName="numKeyStyle"
-        latin:keyLabelFlags="followKeyLargeLetterRatio"
-        latin:parentStyle="numKeyBaseStyle" />
-    <key-style
-        latin:styleName="numModeKeyStyle"
-        latin:keyLabelFlags="fontNormal|followKeyLetterRatio|followFunctionalTextColor"
-        latin:parentStyle="numKeyBaseStyle" />
-    <key-style
-        latin:styleName="numSymbolKeyStyle"
-        latin:parentStyle="numKeyBaseStyle" />
-    <key-style
-        latin:styleName="numberKeyStyle"
-        latin:keyLabelFlags="alignLabelOffCenter|hasHintLabel"
-        latin:parentStyle="numKeyStyle" />
-    <key-style
-        latin:styleName="num0KeyStyle"
-        latin:keySpec="0"
-        latin:parentStyle="numberKeyStyle" />
-    <key-style
-        latin:styleName="num1KeyStyle"
-        latin:keySpec="1"
-        latin:parentStyle="numberKeyStyle" />
-    <key-style
-        latin:styleName="num2KeyStyle"
-        latin:keySpec="2"
-        latin:keyHintLabel="ABC"
-        latin:parentStyle="numberKeyStyle" />
-    <key-style
-        latin:styleName="num3KeyStyle"
-        latin:keySpec="3"
-        latin:keyHintLabel="DEF"
-        latin:parentStyle="numberKeyStyle" />
-    <key-style
-        latin:styleName="num4KeyStyle"
-        latin:keySpec="4"
-        latin:keyHintLabel="GHI"
-        latin:parentStyle="numberKeyStyle" />
-    <key-style
-        latin:styleName="num5KeyStyle"
-        latin:keySpec="5"
-        latin:keyHintLabel="JKL"
-        latin:parentStyle="numberKeyStyle" />
-    <key-style
-        latin:styleName="num6KeyStyle"
-        latin:keySpec="6"
-        latin:keyHintLabel="MNO"
-        latin:parentStyle="numberKeyStyle" />
-    <key-style
-        latin:styleName="num7KeyStyle"
-        latin:keySpec="7"
-        latin:keyHintLabel="PQRS"
-        latin:parentStyle="numberKeyStyle" />
-    <key-style
-        latin:styleName="num8KeyStyle"
-        latin:keySpec="8"
-        latin:keyHintLabel="TUV"
-        latin:parentStyle="numberKeyStyle" />
-    <key-style
-        latin:styleName="num9KeyStyle"
-        latin:keySpec="9"
-        latin:keyHintLabel="WXYZ"
-        latin:parentStyle="numberKeyStyle" />
-    <!-- Only for non-tablet device -->
-    <key-style
-        latin:styleName="numPhoneToSymbolKeyStyle"
-        latin:keySpec="!text/keylabel_to_phone_symbols|!code/key_switch_alpha_symbol"
-        latin:parentStyle="numModeKeyStyle" />
-    <key-style
-        latin:styleName="numPhoneToNumericKeyStyle"
-        latin:keySpec="!text/keylabel_to_phone_numeric|!code/key_switch_alpha_symbol"
-        latin:parentStyle="numModeKeyStyle" />
-    <key-style
-        latin:styleName="numTabKeyStyle"
-        latin:keyActionFlags="noKeyPreview"
-        latin:parentStyle="tabKeyStyle" />
-    <key-style
-        latin:styleName="numSpaceKeyStyle"
-        latin:keySpec="!icon/space_key_for_number_layout|!code/key_space"
-        latin:keyLabelFlags="alignIconToBottom"
-        latin:keyActionFlags="enableLongPress"
-        latin:parentStyle="numKeyBaseStyle" />
-    <!-- TODO: Consolidate these space key styles with numSpaceKeyStyle above by introducing <case>
-         predicator that checks device form-factor. -->
-    <switch>
-        <case latin:keyboardTheme="ICS|KLP">
-            <key-style
-                latin:styleName="tabletNumSpaceKeyStyle"
-                latin:keySpec="!icon/space_key|!code/key_space"
-                latin:backgroundType="functional"
-                latin:keyActionFlags="enableLongPress"
-                latin:parentStyle="numKeyBaseStyle" />
-        </case>
-        <case latin:keyboardTheme="LXXLight|LXXDark">
-            <key-style
-                latin:styleName="tabletNumSpaceKeyStyle"
-                latin:keySpec="!icon/space_key|!code/key_space"
-                latin:backgroundType="spacebar"
-                latin:keyActionFlags="enableLongPress"
-                latin:parentStyle="numKeyBaseStyle" />
-        </case>
-    </switch>
-</merge>
diff --git a/java/res/xml/key_styles_settings.xml b/java/res/xml/key_styles_settings.xml
deleted file mode 100644
index 07f4ac30f..000000000
--- a/java/res/xml/key_styles_settings.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <!-- Key style for the key which may have settings key as more keys. -->
-    <switch>
-        <case
-            latin:clobberSettingsKey="true"
-        >
-            <key-style
-                latin:styleName="settingsMoreKeysStyle"
-                latin:backgroundType="functional" />
-        </case>
-        <!-- clobberSettingsKey="false" -->
-        <default>
-            <key-style
-                latin:styleName="settingsMoreKeysStyle"
-                latin:keyLabelFlags="hasPopupHint"
-                latin:additionalMoreKeys="!text/keyspec_settings"
-                latin:backgroundType="functional" />
-        </default>
-    </switch>
-</merge>
diff --git a/java/res/xml/key_thai_kho_khuat.xml b/java/res/xml/key_thai_kho_khuat.xml
deleted file mode 100644
index d5b333b54..000000000
--- a/java/res/xml/key_thai_kho_khuat.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <switch>
-        <case
-            latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
-        >
-            <!-- U+0E05: "ฅ" THAI CHARACTER KHO KHON -->
-            <Key
-                latin:keySpec="&#x0E05;" />
-        </case>
-        <default>
-            <!-- U+0E03: "ฃ" THAI CHARACTER KHO KHUAT -->
-            <Key
-                latin:keySpec="&#x0E03;" />
-        </default>
-    </switch>
-</merge>
diff --git a/java/res/xml/keyboard_layout_set_arabic.xml b/java/res/xml/keyboard_layout_set_arabic.xml
deleted file mode 100644
index 9ce9af70d..000000000
--- a/java/res/xml/keyboard_layout_set_arabic.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<KeyboardLayoutSet
-    xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <Feature
-        latin:supportedScript="arabic" />
-    <Element
-        latin:elementName="alphabet"
-        latin:elementKeyboard="@xml/kbd_arabic"
-        latin:enableProximityCharsCorrection="true" />
-    <Element
-        latin:elementName="symbols"
-        latin:elementKeyboard="@xml/kbd_symbols" />
-    <Element
-        latin:elementName="symbolsShifted"
-        latin:elementKeyboard="@xml/kbd_symbols_shift" />
-    <Element
-        latin:elementName="phone"
-        latin:elementKeyboard="@xml/kbd_phone" />
-    <Element
-        latin:elementName="phoneSymbols"
-        latin:elementKeyboard="@xml/kbd_phone_symbols" />
-    <Element
-        latin:elementName="number"
-        latin:elementKeyboard="@xml/kbd_number" />
-</KeyboardLayoutSet>
diff --git a/java/res/xml/keyboard_layout_set_armenian_phonetic.xml b/java/res/xml/keyboard_layout_set_armenian_phonetic.xml
deleted file mode 100644
index a727fe29f..000000000
--- a/java/res/xml/keyboard_layout_set_armenian_phonetic.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2013, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<KeyboardLayoutSet
-    xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <Feature
-        latin:supportedScript="armenian" />
-    <Element
-        latin:elementName="alphabet"
-        latin:elementKeyboard="@xml/kbd_armenian_phonetic"
-        latin:enableProximityCharsCorrection="true" />
-    <Element
-        latin:elementName="symbols"
-        latin:elementKeyboard="@xml/kbd_symbols" />
-    <Element
-        latin:elementName="symbolsShifted"
-        latin:elementKeyboard="@xml/kbd_symbols_shift" />
-    <Element
-        latin:elementName="phone"
-        latin:elementKeyboard="@xml/kbd_phone" />
-    <Element
-        latin:elementName="phoneSymbols"
-        latin:elementKeyboard="@xml/kbd_phone_symbols" />
-    <Element
-        latin:elementName="number"
-        latin:elementKeyboard="@xml/kbd_number" />
-</KeyboardLayoutSet>
diff --git a/java/res/xml/keyboard_layout_set_azerty.xml b/java/res/xml/keyboard_layout_set_azerty.xml
deleted file mode 100644
index f793a21fc..000000000
--- a/java/res/xml/keyboard_layout_set_azerty.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<KeyboardLayoutSet
-    xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <Element
-        latin:elementName="alphabet"
-        latin:elementKeyboard="@xml/kbd_azerty"
-        latin:enableProximityCharsCorrection="true" />
-    <Element
-        latin:elementName="symbols"
-        latin:elementKeyboard="@xml/kbd_symbols" />
-    <Element
-        latin:elementName="symbolsShifted"
-        latin:elementKeyboard="@xml/kbd_symbols_shift" />
-    <Element
-        latin:elementName="phone"
-        latin:elementKeyboard="@xml/kbd_phone" />
-    <Element
-        latin:elementName="phoneSymbols"
-        latin:elementKeyboard="@xml/kbd_phone_symbols" />
-    <Element
-        latin:elementName="number"
-        latin:elementKeyboard="@xml/kbd_number" />
-</KeyboardLayoutSet>
diff --git a/java/res/xml/keyboard_layout_set_bengali.xml b/java/res/xml/keyboard_layout_set_bengali.xml
deleted file mode 100644
index da03bc510..000000000
--- a/java/res/xml/keyboard_layout_set_bengali.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2014, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<KeyboardLayoutSet
-    xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <Feature
-        latin:supportedScript="bengali" />
-    <Element
-        latin:elementName="alphabet"
-        latin:elementKeyboard="@xml/kbd_bengali"
-        latin:enableProximityCharsCorrection="true" />
-    <Element
-        latin:elementName="symbols"
-        latin:elementKeyboard="@xml/kbd_symbols" />
-    <Element
-        latin:elementName="symbolsShifted"
-        latin:elementKeyboard="@xml/kbd_symbols_shift" />
-    <Element
-        latin:elementName="phone"
-        latin:elementKeyboard="@xml/kbd_phone" />
-    <Element
-        latin:elementName="phoneSymbols"
-        latin:elementKeyboard="@xml/kbd_phone_symbols" />
-    <Element
-        latin:elementName="number"
-        latin:elementKeyboard="@xml/kbd_number" />
-</KeyboardLayoutSet>
diff --git a/java/res/xml/keyboard_layout_set_bengali_akkhor.xml b/java/res/xml/keyboard_layout_set_bengali_akkhor.xml
deleted file mode 100644
index 15a6c93d8..000000000
--- a/java/res/xml/keyboard_layout_set_bengali_akkhor.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2014, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<KeyboardLayoutSet xmlns:latin="http://schemas.android.com/apk/res-auto" >
-    <Feature latin:supportedScript="bengali" />
-    <Element
-        latin:elementKeyboard="@xml/kbd_bengali_akkhor"
-        latin:elementName="alphabet"
-        latin:enableProximityCharsCorrection="true" />
-    <Element
-        latin:elementKeyboard="@xml/kbd_bengali_akkhor"
-        latin:elementName="alphabetAutomaticShifted"
-        latin:enableProximityCharsCorrection="true" />
-    <!-- On these shifted alphabet layouts the proximity characters correction should be disabled
-         because the letters on these layouts aren't the ones in different case of the above
-         unshifted layouts.-->
-    <Element
-        latin:elementKeyboard="@xml/kbd_bengali_akkhor"
-        latin:elementName="alphabetManualShifted" />
-    <Element
-        latin:elementKeyboard="@xml/kbd_bengali_akkhor"
-        latin:elementName="alphabetShiftLocked" />
-    <Element
-        latin:elementKeyboard="@xml/kbd_bengali_akkhor"
-        latin:elementName="alphabetShiftLockShifted" />
-    <Element
-        latin:elementKeyboard="@xml/kbd_symbols"
-        latin:elementName="symbols" />
-    <Element
-        latin:elementKeyboard="@xml/kbd_symbols_shift"
-        latin:elementName="symbolsShifted" />
-    <Element
-        latin:elementKeyboard="@xml/kbd_phone"
-        latin:elementName="phone" />
-    <Element
-        latin:elementKeyboard="@xml/kbd_phone_symbols"
-        latin:elementName="phoneSymbols" />
-    <Element
-        latin:elementKeyboard="@xml/kbd_number"
-        latin:elementName="number" />
-</KeyboardLayoutSet>
diff --git a/java/res/xml/keyboard_layout_set_bepo.xml b/java/res/xml/keyboard_layout_set_bepo.xml
deleted file mode 100644
index d9d248d29..000000000
--- a/java/res/xml/keyboard_layout_set_bepo.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2015 The CyanogenMod Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-<KeyboardLayoutSet
-    xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <Element
-        latin:elementName="alphabet"
-        latin:elementKeyboard="@xml/kbd_bepo"
-        latin:enableProximityCharsCorrection="true" />
-    <Element
-        latin:elementName="symbols"
-        latin:elementKeyboard="@xml/kbd_symbols" />
-    <Element
-        latin:elementName="symbolsShifted"
-        latin:elementKeyboard="@xml/kbd_symbols_shift" />
-    <Element
-        latin:elementName="phone"
-        latin:elementKeyboard="@xml/kbd_phone" />
-    <Element
-        latin:elementName="phoneSymbols"
-        latin:elementKeyboard="@xml/kbd_phone_symbols" />
-    <Element
-        latin:elementName="number"
-        latin:elementKeyboard="@xml/kbd_number" />
-</KeyboardLayoutSet>
diff --git a/java/res/xml/keyboard_layout_set_bulgarian.xml b/java/res/xml/keyboard_layout_set_bulgarian.xml
deleted file mode 100644
index 6cb1efa63..000000000
--- a/java/res/xml/keyboard_layout_set_bulgarian.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<KeyboardLayoutSet
-    xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <Feature
-        latin:supportedScript="cyrillic" />
-    <Element
-        latin:elementName="alphabet"
-        latin:elementKeyboard="@xml/kbd_bulgarian"
-        latin:enableProximityCharsCorrection="true" />
-    <Element
-        latin:elementName="symbols"
-        latin:elementKeyboard="@xml/kbd_symbols" />
-    <Element
-        latin:elementName="symbolsShifted"
-        latin:elementKeyboard="@xml/kbd_symbols_shift" />
-    <Element
-        latin:elementName="phone"
-        latin:elementKeyboard="@xml/kbd_phone" />
-    <Element
-        latin:elementName="phoneSymbols"
-        latin:elementKeyboard="@xml/kbd_phone_symbols" />
-    <Element
-        latin:elementName="number"
-        latin:elementKeyboard="@xml/kbd_number" />
-</KeyboardLayoutSet>
diff --git a/java/res/xml/keyboard_layout_set_bulgarian_bds.xml b/java/res/xml/keyboard_layout_set_bulgarian_bds.xml
deleted file mode 100644
index 91d7ff4c8..000000000
--- a/java/res/xml/keyboard_layout_set_bulgarian_bds.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<KeyboardLayoutSet
-    xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <Feature
-        latin:supportedScript="cyrillic" />
-    <Element
-        latin:elementName="alphabet"
-        latin:elementKeyboard="@xml/kbd_bulgarian_bds"
-        latin:enableProximityCharsCorrection="true" />
-    <Element
-        latin:elementName="symbols"
-        latin:elementKeyboard="@xml/kbd_symbols" />
-    <Element
-        latin:elementName="symbolsShifted"
-        latin:elementKeyboard="@xml/kbd_symbols_shift" />
-    <Element
-        latin:elementName="phone"
-        latin:elementKeyboard="@xml/kbd_phone" />
-    <Element
-        latin:elementName="phoneSymbols"
-        latin:elementKeyboard="@xml/kbd_phone_symbols" />
-    <Element
-        latin:elementName="number"
-        latin:elementKeyboard="@xml/kbd_number" />
-</KeyboardLayoutSet>
diff --git a/java/res/xml/keyboard_layout_set_colemak.xml b/java/res/xml/keyboard_layout_set_colemak.xml
deleted file mode 100644
index ef3260b9a..000000000
--- a/java/res/xml/keyboard_layout_set_colemak.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<KeyboardLayoutSet
-    xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <Element
-        latin:elementName="alphabet"
-        latin:elementKeyboard="@xml/kbd_colemak"
-        latin:enableProximityCharsCorrection="true" />
-    <Element
-        latin:elementName="symbols"
-        latin:elementKeyboard="@xml/kbd_symbols" />
-    <Element
-        latin:elementName="symbolsShifted"
-        latin:elementKeyboard="@xml/kbd_symbols_shift" />
-    <Element
-        latin:elementName="phone"
-        latin:elementKeyboard="@xml/kbd_phone" />
-    <Element
-        latin:elementName="phoneSymbols"
-        latin:elementKeyboard="@xml/kbd_phone_symbols" />
-    <Element
-        latin:elementName="number"
-        latin:elementKeyboard="@xml/kbd_number" />
-</KeyboardLayoutSet>
diff --git a/java/res/xml/keyboard_layout_set_dvorak.xml b/java/res/xml/keyboard_layout_set_dvorak.xml
deleted file mode 100644
index b35951c40..000000000
--- a/java/res/xml/keyboard_layout_set_dvorak.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<KeyboardLayoutSet
-    xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <Element
-        latin:elementName="alphabet"
-        latin:elementKeyboard="@xml/kbd_dvorak"
-        latin:enableProximityCharsCorrection="true" />
-    <Element
-        latin:elementName="symbols"
-        latin:elementKeyboard="@xml/kbd_symbols" />
-    <Element
-        latin:elementName="symbolsShifted"
-        latin:elementKeyboard="@xml/kbd_symbols_shift" />
-    <Element
-        latin:elementName="phone"
-        latin:elementKeyboard="@xml/kbd_phone" />
-    <Element
-        latin:elementName="phoneSymbols"
-        latin:elementKeyboard="@xml/kbd_phone_symbols" />
-    <Element
-        latin:elementName="number"
-        latin:elementKeyboard="@xml/kbd_number" />
-</KeyboardLayoutSet>
diff --git a/java/res/xml/keyboard_layout_set_east_slavic.xml b/java/res/xml/keyboard_layout_set_east_slavic.xml
deleted file mode 100644
index 4490d6e7c..000000000
--- a/java/res/xml/keyboard_layout_set_east_slavic.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<KeyboardLayoutSet
-    xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <Feature
-        latin:supportedScript="cyrillic" />
-    <Element
-        latin:elementName="alphabet"
-        latin:elementKeyboard="@xml/kbd_east_slavic"
-        latin:enableProximityCharsCorrection="true" />
-    <Element
-        latin:elementName="symbols"
-        latin:elementKeyboard="@xml/kbd_symbols" />
-    <Element
-        latin:elementName="symbolsShifted"
-        latin:elementKeyboard="@xml/kbd_symbols_shift" />
-    <Element
-        latin:elementName="phone"
-        latin:elementKeyboard="@xml/kbd_phone" />
-    <Element
-        latin:elementName="phoneSymbols"
-        latin:elementKeyboard="@xml/kbd_phone_symbols" />
-    <Element
-        latin:elementName="number"
-        latin:elementKeyboard="@xml/kbd_number" />
-</KeyboardLayoutSet>
diff --git a/java/res/xml/keyboard_layout_set_east_slavic_phonetic.xml b/java/res/xml/keyboard_layout_set_east_slavic_phonetic.xml
deleted file mode 100644
index 9aec28404..000000000
--- a/java/res/xml/keyboard_layout_set_east_slavic_phonetic.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<KeyboardLayoutSet
-    xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <Feature
-        latin:supportedScript="cyrillic" />
-    <Element
-        latin:elementName="alphabet"
-        latin:elementKeyboard="@xml/kbd_east_slavic_phonetic"
-        latin:enableProximityCharsCorrection="true" />
-    <Element
-        latin:elementName="symbols"
-        latin:elementKeyboard="@xml/kbd_symbols" />
-    <Element
-        latin:elementName="symbolsShifted"
-        latin:elementKeyboard="@xml/kbd_symbols_shift" />
-    <Element
-        latin:elementName="phone"
-        latin:elementKeyboard="@xml/kbd_phone" />
-    <Element
-        latin:elementName="phoneSymbols"
-        latin:elementKeyboard="@xml/kbd_phone_symbols" />
-    <Element
-        latin:elementName="number"
-        latin:elementKeyboard="@xml/kbd_number" />
-</KeyboardLayoutSet>
diff --git a/java/res/xml/keyboard_layout_set_emoji.xml b/java/res/xml/keyboard_layout_set_emoji.xml
deleted file mode 100644
index ef9fb3164..000000000
--- a/java/res/xml/keyboard_layout_set_emoji.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2015, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<KeyboardLayoutSet
-    xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <Element
-        latin:elementName="emojiRecents"
-        latin:elementKeyboard="@xml/kbd_emoji_recents" />
-    <Element
-        latin:elementName="emojiCategory1"
-        latin:elementKeyboard="@xml/kbd_emoji_category1" />
-    <Element
-        latin:elementName="emojiCategory2"
-        latin:elementKeyboard="@xml/kbd_emoji_category2" />
-    <Element
-        latin:elementName="emojiCategory3"
-        latin:elementKeyboard="@xml/kbd_emoji_category3" />
-    <Element
-        latin:elementName="emojiCategory4"
-        latin:elementKeyboard="@xml/kbd_emoji_category4" />
-    <Element
-        latin:elementName="emojiCategory5"
-        latin:elementKeyboard="@xml/kbd_emoji_category5" />
-    <Element
-        latin:elementName="emojiCategory6"
-        latin:elementKeyboard="@xml/kbd_emoji_category6" />
-    <Element
-        latin:elementName="emojiCategory7"
-        latin:elementKeyboard="@xml/kbd_emoji_category7" />
-    <Element
-        latin:elementName="emojiCategory8"
-        latin:elementKeyboard="@xml/kbd_emoji_category8" />
-    <Element
-        latin:elementName="emojiCategory9"
-        latin:elementKeyboard="@xml/kbd_emoji_category9" />
-    <Element
-        latin:elementName="emojiCategory10"
-        latin:elementKeyboard="@xml/kbd_emoji_category10" />
-    <Element
-        latin:elementName="emojiCategory11"
-        latin:elementKeyboard="@xml/kbd_emoji_category11" />
-    <Element
-        latin:elementName="emojiCategory12"
-        latin:elementKeyboard="@xml/kbd_emoji_category12" />
-    <Element
-        latin:elementName="emojiCategory13"
-        latin:elementKeyboard="@xml/kbd_emoji_category13" />
-    <Element
-        latin:elementName="emojiCategory14"
-        latin:elementKeyboard="@xml/kbd_emoji_category14" />
-    <Element
-        latin:elementName="emojiCategory15"
-        latin:elementKeyboard="@xml/kbd_emoji_category15" />
-    <Element
-        latin:elementName="emojiCategory16"
-        latin:elementKeyboard="@xml/kbd_emoji_category16" />
-</KeyboardLayoutSet>
diff --git a/java/res/xml/keyboard_layout_set_farsi.xml b/java/res/xml/keyboard_layout_set_farsi.xml
deleted file mode 100644
index 20fe42a1d..000000000
--- a/java/res/xml/keyboard_layout_set_farsi.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<KeyboardLayoutSet
-    xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <Feature
-        latin:supportedScript="arabic" />
-    <Element
-        latin:elementName="alphabet"
-        latin:elementKeyboard="@xml/kbd_farsi"
-        latin:enableProximityCharsCorrection="true" />
-    <Element
-        latin:elementName="symbols"
-        latin:elementKeyboard="@xml/kbd_symbols" />
-    <Element
-        latin:elementName="symbolsShifted"
-        latin:elementKeyboard="@xml/kbd_symbols_shift" />
-    <Element
-        latin:elementName="phone"
-        latin:elementKeyboard="@xml/kbd_phone" />
-    <Element
-        latin:elementName="phoneSymbols"
-        latin:elementKeyboard="@xml/kbd_phone_symbols" />
-    <Element
-        latin:elementName="number"
-        latin:elementKeyboard="@xml/kbd_number" />
-</KeyboardLayoutSet>
diff --git a/java/res/xml/keyboard_layout_set_georgian.xml b/java/res/xml/keyboard_layout_set_georgian.xml
deleted file mode 100644
index 35986ff92..000000000
--- a/java/res/xml/keyboard_layout_set_georgian.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<KeyboardLayoutSet
-    xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <Feature
-        latin:supportedScript="georgian" />
-    <Element
-        latin:elementName="alphabet"
-        latin:elementKeyboard="@xml/kbd_georgian"
-        latin:enableProximityCharsCorrection="true" />
-    <Element
-        latin:elementName="alphabetAutomaticShifted"
-        latin:elementKeyboard="@xml/kbd_georgian"
-        latin:enableProximityCharsCorrection="true" />
-    <!-- On these shifted alphabet layouts the proximity characters correction should be disabled
-         because the letters on these layouts aren't the ones in different case of the above
-         unshifted layouts. -->
-    <Element
-        latin:elementName="alphabetManualShifted"
-        latin:elementKeyboard="@xml/kbd_georgian" />
-    <Element
-        latin:elementName="alphabetShiftLocked"
-        latin:elementKeyboard="@xml/kbd_georgian" />
-    <Element
-        latin:elementName="alphabetShiftLockShifted"
-        latin:elementKeyboard="@xml/kbd_georgian" />
-    <Element
-        latin:elementName="symbols"
-        latin:elementKeyboard="@xml/kbd_symbols" />
-    <Element
-        latin:elementName="symbolsShifted"
-        latin:elementKeyboard="@xml/kbd_symbols_shift" />
-    <Element
-        latin:elementName="phone"
-        latin:elementKeyboard="@xml/kbd_phone" />
-    <Element
-        latin:elementName="phoneSymbols"
-        latin:elementKeyboard="@xml/kbd_phone_symbols" />
-    <Element
-        latin:elementName="number"
-        latin:elementKeyboard="@xml/kbd_number" />
-</KeyboardLayoutSet>
diff --git a/java/res/xml/keyboard_layout_set_greek.xml b/java/res/xml/keyboard_layout_set_greek.xml
deleted file mode 100644
index fefc618ef..000000000
--- a/java/res/xml/keyboard_layout_set_greek.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<KeyboardLayoutSet
-    xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <Feature
-        latin:supportedScript="greek" />
-    <Element
-        latin:elementName="alphabet"
-        latin:elementKeyboard="@xml/kbd_greek"
-        latin:enableProximityCharsCorrection="true" />
-    <Element
-        latin:elementName="symbols"
-        latin:elementKeyboard="@xml/kbd_symbols" />
-    <Element
-        latin:elementName="symbolsShifted"
-        latin:elementKeyboard="@xml/kbd_symbols_shift" />
-    <Element
-        latin:elementName="phone"
-        latin:elementKeyboard="@xml/kbd_phone" />
-    <Element
-        latin:elementName="phoneSymbols"
-        latin:elementKeyboard="@xml/kbd_phone_symbols" />
-    <Element
-        latin:elementName="number"
-        latin:elementKeyboard="@xml/kbd_number" />
-</KeyboardLayoutSet>
diff --git a/java/res/xml/keyboard_layout_set_hebrew.xml b/java/res/xml/keyboard_layout_set_hebrew.xml
deleted file mode 100644
index ac83d1655..000000000
--- a/java/res/xml/keyboard_layout_set_hebrew.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<KeyboardLayoutSet
-    xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <Feature
-        latin:supportedScript="hebrew" />
-    <Element
-        latin:elementName="alphabet"
-        latin:elementKeyboard="@xml/kbd_hebrew"
-        latin:enableProximityCharsCorrection="true" />
-    <Element
-        latin:elementName="symbols"
-        latin:elementKeyboard="@xml/kbd_symbols" />
-    <Element
-        latin:elementName="symbolsShifted"
-        latin:elementKeyboard="@xml/kbd_symbols_shift" />
-    <Element
-        latin:elementName="phone"
-        latin:elementKeyboard="@xml/kbd_phone" />
-    <Element
-        latin:elementName="phoneSymbols"
-        latin:elementKeyboard="@xml/kbd_phone_symbols" />
-    <Element
-        latin:elementName="number"
-        latin:elementKeyboard="@xml/kbd_number" />
-</KeyboardLayoutSet>
diff --git a/java/res/xml/keyboard_layout_set_hindi.xml b/java/res/xml/keyboard_layout_set_hindi.xml
deleted file mode 100644
index a522af7c0..000000000
--- a/java/res/xml/keyboard_layout_set_hindi.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<KeyboardLayoutSet
-    xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <Feature
-        latin:supportedScript="devanagari" />
-    <Element
-        latin:elementName="alphabet"
-        latin:elementKeyboard="@xml/kbd_hindi"
-        latin:enableProximityCharsCorrection="true" />
-    <Element
-        latin:elementName="alphabetAutomaticShifted"
-        latin:elementKeyboard="@xml/kbd_hindi"
-        latin:enableProximityCharsCorrection="true" />
-    <!-- On these shifted alphabet layouts the proximity characters correction should be disabled
-         because the letters on these layouts aren't the ones in different case of the above
-         unshifted layouts. -->
-    <Element
-        latin:elementName="alphabetManualShifted"
-        latin:elementKeyboard="@xml/kbd_hindi" />
-    <Element
-        latin:elementName="alphabetShiftLocked"
-        latin:elementKeyboard="@xml/kbd_hindi" />
-    <Element
-        latin:elementName="alphabetShiftLockShifted"
-        latin:elementKeyboard="@xml/kbd_hindi" />
-    <Element
-        latin:elementName="symbols"
-        latin:elementKeyboard="@xml/kbd_symbols" />
-    <Element
-        latin:elementName="symbolsShifted"
-        latin:elementKeyboard="@xml/kbd_symbols_shift" />
-    <Element
-        latin:elementName="phone"
-        latin:elementKeyboard="@xml/kbd_phone" />
-    <Element
-        latin:elementName="phoneSymbols"
-        latin:elementKeyboard="@xml/kbd_phone_symbols" />
-    <Element
-        latin:elementName="number"
-        latin:elementKeyboard="@xml/kbd_number" />
-</KeyboardLayoutSet>
diff --git a/java/res/xml/keyboard_layout_set_hindi_compact.xml b/java/res/xml/keyboard_layout_set_hindi_compact.xml
deleted file mode 100644
index 1ce1d2026..000000000
--- a/java/res/xml/keyboard_layout_set_hindi_compact.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2014, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<KeyboardLayoutSet
-    xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <Feature
-        latin:supportedScript="devanagari" />
-    <Element
-        latin:elementName="alphabet"
-        latin:elementKeyboard="@xml/kbd_hindi_compact"
-        latin:enableProximityCharsCorrection="true" />
-    <Element
-        latin:elementName="symbols"
-        latin:elementKeyboard="@xml/kbd_symbols" />
-    <Element
-        latin:elementName="symbolsShifted"
-        latin:elementKeyboard="@xml/kbd_symbols_shift" />
-    <Element
-        latin:elementName="phone"
-        latin:elementKeyboard="@xml/kbd_phone" />
-    <Element
-        latin:elementName="phoneSymbols"
-        latin:elementKeyboard="@xml/kbd_phone_symbols" />
-    <Element
-        latin:elementName="number"
-        latin:elementKeyboard="@xml/kbd_number" />
-</KeyboardLayoutSet>
diff --git a/java/res/xml/keyboard_layout_set_kannada.xml b/java/res/xml/keyboard_layout_set_kannada.xml
deleted file mode 100644
index 72bca7cf9..000000000
--- a/java/res/xml/keyboard_layout_set_kannada.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2014, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<KeyboardLayoutSet
-    xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <Feature
-        latin:supportedScript="kannada" />
-    <Element
-        latin:elementName="alphabet"
-        latin:elementKeyboard="@xml/kbd_kannada"
-        latin:enableProximityCharsCorrection="true" />
-    <Element
-        latin:elementName="symbols"
-        latin:elementKeyboard="@xml/kbd_symbols" />
-    <Element
-        latin:elementName="symbolsShifted"
-        latin:elementKeyboard="@xml/kbd_symbols_shift" />
-    <Element
-        latin:elementName="phone"
-        latin:elementKeyboard="@xml/kbd_phone" />
-    <Element
-        latin:elementName="phoneSymbols"
-        latin:elementKeyboard="@xml/kbd_phone_symbols" />
-    <Element
-        latin:elementName="number"
-        latin:elementKeyboard="@xml/kbd_number" />
-</KeyboardLayoutSet>
diff --git a/java/res/xml/keyboard_layout_set_khmer.xml b/java/res/xml/keyboard_layout_set_khmer.xml
deleted file mode 100644
index f6889d9de..000000000
--- a/java/res/xml/keyboard_layout_set_khmer.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2013, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<KeyboardLayoutSet
-    xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <Feature
-        latin:supportedScript="khmer" />
-    <Element
-        latin:elementName="alphabet"
-        latin:elementKeyboard="@xml/kbd_khmer"
-        latin:enableProximityCharsCorrection="true" />
-    <Element
-        latin:elementName="alphabetAutomaticShifted"
-        latin:elementKeyboard="@xml/kbd_khmer"
-        latin:enableProximityCharsCorrection="true" />
-    <!-- On these shifted alphabet layouts the proximity characters correction should be disabled
-         because the letters on these layouts aren't the ones in different case of the above
-         unshifted layouts. -->
-    <Element
-        latin:elementName="alphabetManualShifted"
-        latin:elementKeyboard="@xml/kbd_khmer" />
-    <Element
-        latin:elementName="alphabetShiftLocked"
-        latin:elementKeyboard="@xml/kbd_khmer" />
-    <Element
-        latin:elementName="alphabetShiftLockShifted"
-        latin:elementKeyboard="@xml/kbd_khmer" />
-    <Element
-        latin:elementName="symbols"
-        latin:elementKeyboard="@xml/kbd_symbols" />
-    <Element
-        latin:elementName="symbolsShifted"
-        latin:elementKeyboard="@xml/kbd_symbols_shift" />
-    <Element
-        latin:elementName="phone"
-        latin:elementKeyboard="@xml/kbd_phone" />
-    <Element
-        latin:elementName="phoneSymbols"
-        latin:elementKeyboard="@xml/kbd_phone_symbols" />
-    <Element
-        latin:elementName="number"
-        latin:elementKeyboard="@xml/kbd_number" />
-</KeyboardLayoutSet>
diff --git a/java/res/xml/keyboard_layout_set_kurdish.xml b/java/res/xml/keyboard_layout_set_kurdish.xml
deleted file mode 100644
index eedc07af6..000000000
--- a/java/res/xml/keyboard_layout_set_kurdish.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<KeyboardLayoutSet
-    xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <Feature
-        latin:supportedScript="arabic" />
-    <Element
-        latin:elementName="alphabet"
-        latin:elementKeyboard="@xml/kbd_kurdish"
-        latin:enableProximityCharsCorrection="true" />
-    <Element
-        latin:elementName="symbols"
-        latin:elementKeyboard="@xml/kbd_symbols" />
-    <Element
-        latin:elementName="symbolsShifted"
-        latin:elementKeyboard="@xml/kbd_symbols_shift" />
-    <Element
-        latin:elementName="phone"
-        latin:elementKeyboard="@xml/kbd_phone" />
-    <Element
-        latin:elementName="phoneSymbols"
-        latin:elementKeyboard="@xml/kbd_phone_symbols" />
-    <Element
-        latin:elementName="number"
-        latin:elementKeyboard="@xml/kbd_number" />
-</KeyboardLayoutSet>
diff --git a/java/res/xml/keyboard_layout_set_lao.xml b/java/res/xml/keyboard_layout_set_lao.xml
deleted file mode 100644
index 860e39601..000000000
--- a/java/res/xml/keyboard_layout_set_lao.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2013, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<KeyboardLayoutSet
-    xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <Feature
-        latin:supportedScript="lao" />
-    <Element
-        latin:elementName="alphabet"
-        latin:elementKeyboard="@xml/kbd_lao"
-        latin:enableProximityCharsCorrection="true" />
-    <Element
-        latin:elementName="alphabetAutomaticShifted"
-        latin:elementKeyboard="@xml/kbd_lao"
-        latin:enableProximityCharsCorrection="true" />
-    <!-- On these shifted alphabet layouts the proximity characters correction should be disabled
-         because the letters on these layouts aren't the ones in different case of the above
-         unshifted layouts. -->
-    <Element
-        latin:elementName="alphabetManualShifted"
-        latin:elementKeyboard="@xml/kbd_lao" />
-    <Element
-        latin:elementName="alphabetShiftLocked"
-        latin:elementKeyboard="@xml/kbd_lao" />
-    <Element
-        latin:elementName="alphabetShiftLockShifted"
-        latin:elementKeyboard="@xml/kbd_lao" />
-    <Element
-        latin:elementName="symbols"
-        latin:elementKeyboard="@xml/kbd_symbols" />
-    <Element
-        latin:elementName="symbolsShifted"
-        latin:elementKeyboard="@xml/kbd_symbols_shift" />
-    <Element
-        latin:elementName="phone"
-        latin:elementKeyboard="@xml/kbd_phone" />
-    <Element
-        latin:elementName="phoneSymbols"
-        latin:elementKeyboard="@xml/kbd_phone_symbols" />
-    <Element
-        latin:elementName="number"
-        latin:elementKeyboard="@xml/kbd_number" />
-</KeyboardLayoutSet>
diff --git a/java/res/xml/keyboard_layout_set_malayalam.xml b/java/res/xml/keyboard_layout_set_malayalam.xml
deleted file mode 100644
index 10931fcbb..000000000
--- a/java/res/xml/keyboard_layout_set_malayalam.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2014, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<KeyboardLayoutSet
-    xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <Feature
-        latin:supportedScript="malayalam" />
-    <Element
-        latin:elementName="alphabet"
-        latin:elementKeyboard="@xml/kbd_malayalam"
-        latin:enableProximityCharsCorrection="true" />
-    <Element
-        latin:elementName="symbols"
-        latin:elementKeyboard="@xml/kbd_symbols" />
-    <Element
-        latin:elementName="symbolsShifted"
-        latin:elementKeyboard="@xml/kbd_symbols_shift" />
-    <Element
-        latin:elementName="phone"
-        latin:elementKeyboard="@xml/kbd_phone" />
-    <Element
-        latin:elementName="phoneSymbols"
-        latin:elementKeyboard="@xml/kbd_phone_symbols" />
-    <Element
-        latin:elementName="number"
-        latin:elementKeyboard="@xml/kbd_number" />
-</KeyboardLayoutSet>
diff --git a/java/res/xml/keyboard_layout_set_marathi.xml b/java/res/xml/keyboard_layout_set_marathi.xml
deleted file mode 100644
index 5822b7b52..000000000
--- a/java/res/xml/keyboard_layout_set_marathi.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2014, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<KeyboardLayoutSet
-    xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <Feature
-        latin:supportedScript="devanagari" />
-    <Element
-        latin:elementName="alphabet"
-        latin:elementKeyboard="@xml/kbd_marathi"
-        latin:enableProximityCharsCorrection="true" />
-    <Element
-        latin:elementName="symbols"
-        latin:elementKeyboard="@xml/kbd_symbols" />
-    <Element
-        latin:elementName="symbolsShifted"
-        latin:elementKeyboard="@xml/kbd_symbols_shift" />
-    <Element
-        latin:elementName="phone"
-        latin:elementKeyboard="@xml/kbd_phone" />
-    <Element
-        latin:elementName="phoneSymbols"
-        latin:elementKeyboard="@xml/kbd_phone_symbols" />
-    <Element
-        latin:elementName="number"
-        latin:elementKeyboard="@xml/kbd_number" />
-</KeyboardLayoutSet>
diff --git a/java/res/xml/keyboard_layout_set_mongolian.xml b/java/res/xml/keyboard_layout_set_mongolian.xml
deleted file mode 100644
index a476109dd..000000000
--- a/java/res/xml/keyboard_layout_set_mongolian.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<KeyboardLayoutSet
-    xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <Feature
-        latin:supportedScript="cyrillic" />
-    <Element
-        latin:elementName="alphabet"
-        latin:elementKeyboard="@xml/kbd_mongolian"
-        latin:enableProximityCharsCorrection="true" />
-    <Element
-        latin:elementName="symbols"
-        latin:elementKeyboard="@xml/kbd_symbols" />
-    <Element
-        latin:elementName="symbolsShifted"
-        latin:elementKeyboard="@xml/kbd_symbols_shift" />
-    <Element
-        latin:elementName="phone"
-        latin:elementKeyboard="@xml/kbd_phone" />
-    <Element
-        latin:elementName="phoneSymbols"
-        latin:elementKeyboard="@xml/kbd_phone_symbols" />
-    <Element
-        latin:elementName="number"
-        latin:elementKeyboard="@xml/kbd_number" />
-</KeyboardLayoutSet>
diff --git a/java/res/xml/keyboard_layout_set_nepali_romanized.xml b/java/res/xml/keyboard_layout_set_nepali_romanized.xml
deleted file mode 100644
index 195429be3..000000000
--- a/java/res/xml/keyboard_layout_set_nepali_romanized.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2013, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<KeyboardLayoutSet
-    xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <Feature
-        latin:supportedScript="devanagari" />
-    <Element
-        latin:elementName="alphabet"
-        latin:elementKeyboard="@xml/kbd_nepali_romanized"
-        latin:enableProximityCharsCorrection="true" />
-    <Element
-        latin:elementName="alphabetAutomaticShifted"
-        latin:elementKeyboard="@xml/kbd_nepali_romanized"
-        latin:enableProximityCharsCorrection="true" />
-    <!-- On these shifted alphabet layouts the proximity characters correction should be disabled
-         because the letters on these layouts aren't the ones in different case of the above
-         unshifted layouts. -->
-    <Element
-        latin:elementName="alphabetManualShifted"
-        latin:elementKeyboard="@xml/kbd_nepali_romanized" />
-    <Element
-        latin:elementName="alphabetShiftLocked"
-        latin:elementKeyboard="@xml/kbd_nepali_romanized" />
-    <Element
-        latin:elementName="alphabetShiftLockShifted"
-        latin:elementKeyboard="@xml/kbd_nepali_romanized" />
-    <Element
-        latin:elementName="symbols"
-        latin:elementKeyboard="@xml/kbd_symbols" />
-    <Element
-        latin:elementName="symbolsShifted"
-        latin:elementKeyboard="@xml/kbd_symbols_shift" />
-    <Element
-        latin:elementName="phone"
-        latin:elementKeyboard="@xml/kbd_phone" />
-    <Element
-        latin:elementName="phoneSymbols"
-        latin:elementKeyboard="@xml/kbd_phone_symbols" />
-    <Element
-        latin:elementName="number"
-        latin:elementKeyboard="@xml/kbd_number" />
-</KeyboardLayoutSet>
diff --git a/java/res/xml/keyboard_layout_set_nepali_traditional.xml b/java/res/xml/keyboard_layout_set_nepali_traditional.xml
deleted file mode 100644
index 9ca13645a..000000000
--- a/java/res/xml/keyboard_layout_set_nepali_traditional.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2013, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<KeyboardLayoutSet
-    xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <Feature
-        latin:supportedScript="devanagari" />
-    <Element
-        latin:elementName="alphabet"
-        latin:elementKeyboard="@xml/kbd_nepali_traditional"
-        latin:enableProximityCharsCorrection="true" />
-    <Element
-        latin:elementName="alphabetAutomaticShifted"
-        latin:elementKeyboard="@xml/kbd_nepali_traditional"
-        latin:enableProximityCharsCorrection="true" />
-    <!-- On these shifted alphabet layouts the proximity characters correction should be disabled
-         because the letters on these layouts aren't the ones in different case of the above
-         unshifted layouts. -->
-    <Element
-        latin:elementName="alphabetManualShifted"
-        latin:elementKeyboard="@xml/kbd_nepali_traditional" />
-    <Element
-        latin:elementName="alphabetShiftLocked"
-        latin:elementKeyboard="@xml/kbd_nepali_traditional" />
-    <Element
-        latin:elementName="alphabetShiftLockShifted"
-        latin:elementKeyboard="@xml/kbd_nepali_traditional" />
-    <Element
-        latin:elementName="symbols"
-        latin:elementKeyboard="@xml/kbd_symbols" />
-    <Element
-        latin:elementName="symbolsShifted"
-        latin:elementKeyboard="@xml/kbd_symbols_shift" />
-    <Element
-        latin:elementName="phone"
-        latin:elementKeyboard="@xml/kbd_phone" />
-    <Element
-        latin:elementName="phoneSymbols"
-        latin:elementKeyboard="@xml/kbd_phone_symbols" />
-    <Element
-        latin:elementName="number"
-        latin:elementKeyboard="@xml/kbd_number" />
-</KeyboardLayoutSet>
diff --git a/java/res/xml/keyboard_layout_set_nordic.xml b/java/res/xml/keyboard_layout_set_nordic.xml
deleted file mode 100644
index 9e37bf988..000000000
--- a/java/res/xml/keyboard_layout_set_nordic.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<KeyboardLayoutSet
-    xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <Element
-        latin:elementName="alphabet"
-        latin:elementKeyboard="@xml/kbd_nordic"
-        latin:enableProximityCharsCorrection="true"
-        latin:allowRedundantMoreKeys="false" />
-    <Element
-        latin:elementName="symbols"
-        latin:elementKeyboard="@xml/kbd_symbols" />
-    <Element
-        latin:elementName="symbolsShifted"
-        latin:elementKeyboard="@xml/kbd_symbols_shift" />
-    <Element
-        latin:elementName="phone"
-        latin:elementKeyboard="@xml/kbd_phone" />
-    <Element
-        latin:elementName="phoneSymbols"
-        latin:elementKeyboard="@xml/kbd_phone_symbols" />
-    <Element
-        latin:elementName="number"
-        latin:elementKeyboard="@xml/kbd_number" />
-</KeyboardLayoutSet>
diff --git a/java/res/xml/keyboard_layout_set_pcqwerty.xml b/java/res/xml/keyboard_layout_set_pcqwerty.xml
deleted file mode 100644
index 87fdb16b8..000000000
--- a/java/res/xml/keyboard_layout_set_pcqwerty.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<KeyboardLayoutSet
-    xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <Element
-        latin:elementName="alphabet"
-        latin:elementKeyboard="@xml/kbd_pcqwerty"
-        latin:enableProximityCharsCorrection="true" />
-    <Element
-        latin:elementName="phone"
-        latin:elementKeyboard="@xml/kbd_phone" />
-    <Element
-        latin:elementName="phoneSymbols"
-        latin:elementKeyboard="@xml/kbd_phone_symbols" />
-    <Element
-        latin:elementName="number"
-        latin:elementKeyboard="@xml/kbd_number" />
-</KeyboardLayoutSet>
diff --git a/java/res/xml/keyboard_layout_set_qwerty.xml b/java/res/xml/keyboard_layout_set_qwerty.xml
deleted file mode 100644
index a95c5b6a8..000000000
--- a/java/res/xml/keyboard_layout_set_qwerty.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<KeyboardLayoutSet
-    xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <Element
-        latin:elementName="alphabet"
-        latin:elementKeyboard="@xml/kbd_qwerty"
-        latin:enableProximityCharsCorrection="true"
-        latin:supportsSplitLayout="true" />
-    <Element
-        latin:elementName="symbols"
-        latin:elementKeyboard="@xml/kbd_symbols" />
-    <Element
-        latin:elementName="symbolsShifted"
-        latin:elementKeyboard="@xml/kbd_symbols_shift" />
-    <Element
-        latin:elementName="phone"
-        latin:elementKeyboard="@xml/kbd_phone" />
-    <Element
-        latin:elementName="phoneSymbols"
-        latin:elementKeyboard="@xml/kbd_phone_symbols" />
-    <Element
-        latin:elementName="number"
-        latin:elementKeyboard="@xml/kbd_number" />
-</KeyboardLayoutSet>
diff --git a/java/res/xml/keyboard_layout_set_qwertz.xml b/java/res/xml/keyboard_layout_set_qwertz.xml
deleted file mode 100644
index 968f5275d..000000000
--- a/java/res/xml/keyboard_layout_set_qwertz.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<KeyboardLayoutSet
-    xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <Element
-        latin:elementName="alphabet"
-        latin:elementKeyboard="@xml/kbd_qwertz"
-        latin:enableProximityCharsCorrection="true" />
-    <Element
-        latin:elementName="symbols"
-        latin:elementKeyboard="@xml/kbd_symbols" />
-    <Element
-        latin:elementName="symbolsShifted"
-        latin:elementKeyboard="@xml/kbd_symbols_shift" />
-    <Element
-        latin:elementName="phone"
-        latin:elementKeyboard="@xml/kbd_phone" />
-    <Element
-        latin:elementName="phoneSymbols"
-        latin:elementKeyboard="@xml/kbd_phone_symbols" />
-    <Element
-        latin:elementName="number"
-        latin:elementKeyboard="@xml/kbd_number" />
-</KeyboardLayoutSet>
diff --git a/java/res/xml/keyboard_layout_set_serbian_qwertz.xml b/java/res/xml/keyboard_layout_set_serbian_qwertz.xml
deleted file mode 100644
index ee6353dbb..000000000
--- a/java/res/xml/keyboard_layout_set_serbian_qwertz.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2014, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<KeyboardLayoutSet xmlns:latin="http://schemas.android.com/apk/res-auto" >
-    <Element
-        latin:allowRedundantMoreKeys="false"
-        latin:elementKeyboard="@xml/kbd_serbian_qwertz"
-        latin:elementName="alphabet"
-        latin:enableProximityCharsCorrection="true" />
-    <Element
-        latin:elementKeyboard="@xml/kbd_symbols"
-        latin:elementName="symbols" />
-    <Element
-        latin:elementKeyboard="@xml/kbd_symbols_shift"
-        latin:elementName="symbolsShifted" />
-    <Element
-        latin:elementKeyboard="@xml/kbd_phone"
-        latin:elementName="phone" />
-    <Element
-        latin:elementKeyboard="@xml/kbd_phone_symbols"
-        latin:elementName="phoneSymbols" />
-    <Element
-        latin:elementKeyboard="@xml/kbd_number"
-        latin:elementName="number" />
-</KeyboardLayoutSet>
\ No newline at end of file
diff --git a/java/res/xml/keyboard_layout_set_sinhala.xml b/java/res/xml/keyboard_layout_set_sinhala.xml
deleted file mode 100644
index a72d39130..000000000
--- a/java/res/xml/keyboard_layout_set_sinhala.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2014, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<KeyboardLayoutSet
-    xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <Feature
-        latin:supportedScript="sinhala" />
-    <Element
-        latin:elementName="alphabet"
-        latin:elementKeyboard="@xml/kbd_sinhala"
-        latin:enableProximityCharsCorrection="true" />
-    <Element
-        latin:elementName="alphabetAutomaticShifted"
-        latin:elementKeyboard="@xml/kbd_sinhala"
-        latin:enableProximityCharsCorrection="true" />
-    <!-- On these shifted alphabet layouts the proximity characters correction should be disabled
-         because the letters on these layouts aren't the ones in different case of the above
-         unshifted layouts. -->
-    <Element
-        latin:elementName="alphabetManualShifted"
-        latin:elementKeyboard="@xml/kbd_sinhala" />
-    <Element
-        latin:elementName="alphabetShiftLocked"
-        latin:elementKeyboard="@xml/kbd_sinhala" />
-    <Element
-        latin:elementName="alphabetShiftLockShifted"
-        latin:elementKeyboard="@xml/kbd_sinhala" />
-    <Element
-        latin:elementName="symbols"
-        latin:elementKeyboard="@xml/kbd_symbols" />
-    <Element
-        latin:elementName="symbolsShifted"
-        latin:elementKeyboard="@xml/kbd_symbols_shift" />
-    <Element
-        latin:elementName="phone"
-        latin:elementKeyboard="@xml/kbd_phone" />
-    <Element
-        latin:elementName="phoneSymbols"
-        latin:elementKeyboard="@xml/kbd_phone_symbols" />
-    <Element
-        latin:elementName="number"
-        latin:elementKeyboard="@xml/kbd_number" />
-</KeyboardLayoutSet>
diff --git a/java/res/xml/keyboard_layout_set_south_slavic.xml b/java/res/xml/keyboard_layout_set_south_slavic.xml
deleted file mode 100644
index c51b37102..000000000
--- a/java/res/xml/keyboard_layout_set_south_slavic.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<KeyboardLayoutSet
-    xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <Feature
-        latin:supportedScript="cyrillic" />
-    <Element
-        latin:elementName="alphabet"
-        latin:elementKeyboard="@xml/kbd_south_slavic"
-        latin:enableProximityCharsCorrection="true" />
-    <Element
-        latin:elementName="symbols"
-        latin:elementKeyboard="@xml/kbd_symbols" />
-    <Element
-        latin:elementName="symbolsShifted"
-        latin:elementKeyboard="@xml/kbd_symbols_shift" />
-    <Element
-        latin:elementName="phone"
-        latin:elementKeyboard="@xml/kbd_phone" />
-    <Element
-        latin:elementName="phoneSymbols"
-        latin:elementKeyboard="@xml/kbd_phone_symbols" />
-    <Element
-        latin:elementName="number"
-        latin:elementKeyboard="@xml/kbd_number" />
-</KeyboardLayoutSet>
diff --git a/java/res/xml/keyboard_layout_set_spanish.xml b/java/res/xml/keyboard_layout_set_spanish.xml
deleted file mode 100644
index 78a3d0ff6..000000000
--- a/java/res/xml/keyboard_layout_set_spanish.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<KeyboardLayoutSet
-    xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <Element
-        latin:elementName="alphabet"
-        latin:elementKeyboard="@xml/kbd_spanish"
-        latin:enableProximityCharsCorrection="true" />
-    <Element
-        latin:elementName="symbols"
-        latin:elementKeyboard="@xml/kbd_symbols" />
-    <Element
-        latin:elementName="symbolsShifted"
-        latin:elementKeyboard="@xml/kbd_symbols_shift" />
-    <Element
-        latin:elementName="phone"
-        latin:elementKeyboard="@xml/kbd_phone" />
-    <Element
-        latin:elementName="phoneSymbols"
-        latin:elementKeyboard="@xml/kbd_phone_symbols" />
-    <Element
-        latin:elementName="number"
-        latin:elementKeyboard="@xml/kbd_number" />
-</KeyboardLayoutSet>
diff --git a/java/res/xml/keyboard_layout_set_swiss.xml b/java/res/xml/keyboard_layout_set_swiss.xml
deleted file mode 100644
index ec7d0d0f6..000000000
--- a/java/res/xml/keyboard_layout_set_swiss.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2013, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<KeyboardLayoutSet
-    xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <Element
-        latin:elementName="alphabet"
-        latin:elementKeyboard="@xml/kbd_swiss"
-        latin:enableProximityCharsCorrection="true"
-        latin:allowRedundantMoreKeys="true" />
-    <Element
-        latin:elementName="symbols"
-        latin:elementKeyboard="@xml/kbd_symbols" />
-    <Element
-        latin:elementName="symbolsShifted"
-        latin:elementKeyboard="@xml/kbd_symbols_shift" />
-    <Element
-        latin:elementName="phone"
-        latin:elementKeyboard="@xml/kbd_phone" />
-    <Element
-        latin:elementName="phoneSymbols"
-        latin:elementKeyboard="@xml/kbd_phone_symbols" />
-    <Element
-        latin:elementName="number"
-        latin:elementKeyboard="@xml/kbd_number" />
-</KeyboardLayoutSet>
diff --git a/java/res/xml/keyboard_layout_set_tamil.xml b/java/res/xml/keyboard_layout_set_tamil.xml
deleted file mode 100644
index 7a89a10fc..000000000
--- a/java/res/xml/keyboard_layout_set_tamil.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2014, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<KeyboardLayoutSet
-    xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <Feature
-        latin:supportedScript="tamil" />
-    <Element
-        latin:elementName="alphabet"
-        latin:elementKeyboard="@xml/kbd_tamil"
-        latin:enableProximityCharsCorrection="true" />
-    <Element
-        latin:elementName="symbols"
-        latin:elementKeyboard="@xml/kbd_symbols" />
-    <Element
-        latin:elementName="symbolsShifted"
-        latin:elementKeyboard="@xml/kbd_symbols_shift" />
-    <Element
-        latin:elementName="phone"
-        latin:elementKeyboard="@xml/kbd_phone" />
-    <Element
-        latin:elementName="phoneSymbols"
-        latin:elementKeyboard="@xml/kbd_phone_symbols" />
-    <Element
-        latin:elementName="number"
-        latin:elementKeyboard="@xml/kbd_number" />
-</KeyboardLayoutSet>
diff --git a/java/res/xml/keyboard_layout_set_telugu.xml b/java/res/xml/keyboard_layout_set_telugu.xml
deleted file mode 100644
index 56d5b5a7b..000000000
--- a/java/res/xml/keyboard_layout_set_telugu.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2014, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<KeyboardLayoutSet
-    xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <Feature
-        latin:supportedScript="telugu" />
-    <Element
-        latin:elementName="alphabet"
-        latin:elementKeyboard="@xml/kbd_telugu"
-        latin:enableProximityCharsCorrection="true" />
-    <Element
-        latin:elementName="symbols"
-        latin:elementKeyboard="@xml/kbd_symbols" />
-    <Element
-        latin:elementName="symbolsShifted"
-        latin:elementKeyboard="@xml/kbd_symbols_shift" />
-    <Element
-        latin:elementName="phone"
-        latin:elementKeyboard="@xml/kbd_phone" />
-    <Element
-        latin:elementName="phoneSymbols"
-        latin:elementKeyboard="@xml/kbd_phone_symbols" />
-    <Element
-        latin:elementName="number"
-        latin:elementKeyboard="@xml/kbd_number" />
-</KeyboardLayoutSet>
diff --git a/java/res/xml/keyboard_layout_set_thai.xml b/java/res/xml/keyboard_layout_set_thai.xml
deleted file mode 100644
index 22ccd4e13..000000000
--- a/java/res/xml/keyboard_layout_set_thai.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<KeyboardLayoutSet
-    xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <Feature
-        latin:supportedScript="thai" />
-    <Element
-        latin:elementName="alphabet"
-        latin:elementKeyboard="@xml/kbd_thai"
-        latin:enableProximityCharsCorrection="true" />
-    <Element
-        latin:elementName="alphabetAutomaticShifted"
-        latin:elementKeyboard="@xml/kbd_thai"
-        latin:enableProximityCharsCorrection="true" />
-    <!-- On these shifted alphabet layouts the proximity characters correction should be disabled
-         because the letters on these layouts aren't the ones in different case of the above
-         unshifted layouts. -->
-    <Element
-        latin:elementName="alphabetManualShifted"
-        latin:elementKeyboard="@xml/kbd_thai" />
-    <Element
-        latin:elementName="alphabetShiftLocked"
-        latin:elementKeyboard="@xml/kbd_thai" />
-    <Element
-        latin:elementName="alphabetShiftLockShifted"
-        latin:elementKeyboard="@xml/kbd_thai" />
-    <Element
-        latin:elementName="symbols"
-        latin:elementKeyboard="@xml/kbd_symbols" />
-    <Element
-        latin:elementName="symbolsShifted"
-        latin:elementKeyboard="@xml/kbd_symbols_shift" />
-    <Element
-        latin:elementName="phone"
-        latin:elementKeyboard="@xml/kbd_phone" />
-    <Element
-        latin:elementName="phoneSymbols"
-        latin:elementKeyboard="@xml/kbd_phone_symbols" />
-    <Element
-        latin:elementName="number"
-        latin:elementKeyboard="@xml/kbd_number" />
-</KeyboardLayoutSet>
diff --git a/java/res/xml/keyboard_layout_set_turkish.xml b/java/res/xml/keyboard_layout_set_turkish.xml
deleted file mode 100644
index ed8e0ebbe..000000000
--- a/java/res/xml/keyboard_layout_set_turkish.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<KeyboardLayoutSet
-    xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <Element
-        latin:elementName="alphabet"
-        latin:elementKeyboard="@xml/kdb_turkish"
-        latin:enableProximityCharsCorrection="true" />
-    <Element
-        latin:elementName="symbols"
-        latin:elementKeyboard="@xml/kbd_symbols" />
-    <Element
-        latin:elementName="symbolsShifted"
-        latin:elementKeyboard="@xml/kbd_symbols_shift" />
-    <Element
-        latin:elementName="phone"
-        latin:elementKeyboard="@xml/kbd_phone" />
-    <Element
-        latin:elementName="phoneSymbols"
-        latin:elementKeyboard="@xml/kbd_phone_symbols" />
-    <Element
-        latin:elementName="number"
-        latin:elementKeyboard="@xml/kbd_number" />
-</KeyboardLayoutSet>
diff --git a/java/res/xml/keyboard_layout_set_uzbek.xml b/java/res/xml/keyboard_layout_set_uzbek.xml
deleted file mode 100644
index 16b84331d..000000000
--- a/java/res/xml/keyboard_layout_set_uzbek.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2014, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<KeyboardLayoutSet xmlns:latin="http://schemas.android.com/apk/res-auto" >
-    <Element
-        latin:elementName="alphabet"
-        latin:elementKeyboard="@xml/kbd_uzbek"
-        latin:enableProximityCharsCorrection="true"
-        latin:allowRedundantMoreKeys="true" />
-    <Element
-        latin:elementKeyboard="@xml/kbd_symbols"
-        latin:elementName="symbols" />
-    <Element
-        latin:elementKeyboard="@xml/kbd_symbols_shift"
-        latin:elementName="symbolsShifted" />
-    <Element
-        latin:elementKeyboard="@xml/kbd_phone"
-        latin:elementName="phone" />
-    <Element
-        latin:elementKeyboard="@xml/kbd_phone_symbols"
-        latin:elementName="phoneSymbols" />
-    <Element
-        latin:elementKeyboard="@xml/kbd_number"
-        latin:elementName="number" />
-</KeyboardLayoutSet>
\ No newline at end of file
diff --git a/java/res/xml/keys_arabic3_left.xml b/java/res/xml/keys_arabic3_left.xml
deleted file mode 100644
index 309a15fca..000000000
--- a/java/res/xml/keys_arabic3_left.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2013, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <!-- U+0630: "ذ" ARABIC LETTER THAL -->
-    <Key
-        latin:keySpec="&#x0630;" />
-</merge>
diff --git a/java/res/xml/keys_curly_brackets.xml b/java/res/xml/keys_curly_brackets.xml
deleted file mode 100644
index 20e4604c9..000000000
--- a/java/res/xml/keys_curly_brackets.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <Key
-        latin:keySpec="!text/keyspec_left_curly_bracket" />
-    <Key
-        latin:keySpec="!text/keyspec_right_curly_bracket" />
-</merge>
diff --git a/java/res/xml/keys_dvorak_123.xml b/java/res/xml/keys_dvorak_123.xml
deleted file mode 100644
index 3e7d8e44a..000000000
--- a/java/res/xml/keys_dvorak_123.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <switch>
-        <case
-            latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
-        >
-            <Key
-                latin:keySpec="&quot;"
-                latin:moreKeys="!text/qwertysyms_q,!text/number_1" />
-        </case>
-        <case
-            latin:mode="url"
-        >
-            <Key
-                latin:keySpec="/"
-                latin:moreKeys="!text/qwertysyms_q,!text/number_1" />
-        </case>
-        <case
-            latin:mode="email"
-        >
-            <Key
-                latin:keySpec="\@"
-                latin:moreKeys="!text/qwertysyms_q,!text/number_1" />
-        </case>
-        <default>
-            <Key
-                latin:keySpec="\'"
-                latin:moreKeys="!text/qwertysyms_q,!text/number_1" />
-        </default>
-    </switch>
-    <switch>
-        <case
-            latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
-        >
-            <Key
-                latin:keySpec="&lt;"
-                latin:moreKeys="!text/qwertysyms_w,!text/number_2" />
-            <Key
-                latin:keySpec="&gt;"
-                latin:moreKeys="!text/qwertysyms_e,!text/number_3" />
-        </case>
-        <default>
-            <Key
-                latin:keySpec=","
-                latin:moreKeys="!text/qwertysyms_w,!text/number_2" />
-            <Key
-                latin:keySpec="."
-                latin:moreKeys="!text/qwertysyms_e,!text/number_3" />
-        </default>
-    </switch>
-</merge>
diff --git a/java/res/xml/keys_farsi3_right.xml b/java/res/xml/keys_farsi3_right.xml
deleted file mode 100644
index 72607de1c..000000000
--- a/java/res/xml/keys_farsi3_right.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2013, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <!-- U+0686: "چ" ARABIC LETTER TCHEH -->
-    <Key
-        latin:keySpec="&#x0686;" />
-</merge>
diff --git a/java/res/xml/keys_kurdish_left.xml b/java/res/xml/keys_kurdish_left.xml
deleted file mode 100644
index 309a15fca..000000000
--- a/java/res/xml/keys_kurdish_left.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2013, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <!-- U+0630: "ذ" ARABIC LETTER THAL -->
-    <Key
-        latin:keySpec="&#x0630;" />
-</merge>
diff --git a/java/res/xml/keys_parentheses.xml b/java/res/xml/keys_parentheses.xml
deleted file mode 100644
index 98919d4c9..000000000
--- a/java/res/xml/keys_parentheses.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <Key
-        latin:keySpec="!text/keyspec_left_parenthesis"
-        latin:moreKeys="!text/morekeys_left_parenthesis" />
-    <Key
-        latin:keySpec="!text/keyspec_right_parenthesis"
-        latin:moreKeys="!text/morekeys_right_parenthesis" />
-</merge>
diff --git a/java/res/xml/keys_pcqwerty2_right3.xml b/java/res/xml/keys_pcqwerty2_right3.xml
deleted file mode 100644
index aec7e4093..000000000
--- a/java/res/xml/keys_pcqwerty2_right3.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <switch>
-        <case
-            latin:keyboardLayoutSetElement="alphabet|alphabetAutomaticShifted|alphabetShiftLocked"
-        >
-            <Key
-                latin:keySpec="["
-                latin:additionalMoreKeys="{" />
-            <Key
-                latin:keySpec="]"
-                latin:additionalMoreKeys="}" />
-            <Key
-                latin:keySpec="\\"
-                latin:additionalMoreKeys="\\|" />
-        </case>
-        <!-- keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted" -->
-        <default>
-            <Key
-                latin:keySpec="{" />
-            <Key
-                latin:keySpec="}" />
-            <Key
-                latin:keySpec="|" />
-        </default>
-    </switch>
-</merge>
diff --git a/java/res/xml/keys_pcqwerty3_right2.xml b/java/res/xml/keys_pcqwerty3_right2.xml
deleted file mode 100644
index 147c87a45..000000000
--- a/java/res/xml/keys_pcqwerty3_right2.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <switch>
-        <case
-            latin:keyboardLayoutSetElement="alphabet|alphabetAutomaticShifted|alphabetShiftLocked"
-        >
-            <Key
-                latin:keySpec=";"
-                latin:additionalMoreKeys=":" />
-            <Key
-                latin:keySpec="\'"
-                latin:additionalMoreKeys="&quot;"
-                latin:moreKeys="!fixedColumnOrder!4,!text/double_quotes,%,!text/single_quotes" />
-        </case>
-        <!-- keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted" -->
-        <default>
-            <Key
-                latin:keySpec=":" />
-            <Key
-                latin:keySpec="&quot;"
-                latin:moreKeys="!fixedColumnOrder!3,!text/double_quotes,!text/single_quotes" />
-        </default>
-    </switch>
-</merge>
diff --git a/java/res/xml/keys_pcqwerty4_right3.xml b/java/res/xml/keys_pcqwerty4_right3.xml
deleted file mode 100644
index 75bfd0892..000000000
--- a/java/res/xml/keys_pcqwerty4_right3.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <switch>
-        <case
-            latin:keyboardLayoutSetElement="alphabet|alphabetAutomaticShifted|alphabetShiftLocked"
-        >
-            <Key
-                latin:keySpec=","
-                latin:additionalMoreKeys="&lt;" />
-            <Key
-                latin:keySpec="."
-                latin:additionalMoreKeys="&gt;" />
-            <Key
-                latin:keySpec="/"
-                latin:additionalMoreKeys="\?"
-                latin:moreKeys="!text/morekeys_question" />
-        </case>
-        <!-- keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted" -->
-        <default>
-            <!-- U+2039: "‹" SINGLE LEFT-POINTING ANGLE QUOTATION MARK
-                 U+203A: "›" SINGLE RIGHT-POINTING ANGLE QUOTATION MARK
-                 U+2264: "≤" LESS-THAN OR EQUAL TO
-                 U+2265: "≥" GREATER-THAN EQUAL TO
-                 U+00AB: "«" LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
-                 U+00BB: "»" RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK -->
-            <Key
-                latin:keySpec="&lt;"
-                latin:moreKeys="!fixedColumnOrder!3,&#x2039;,&#x2264;,&#x00AB;" />
-            <Key
-                latin:keySpec="&gt;"
-                latin:moreKeys="!fixedColumnOrder!3,&#x203A;,&#x2265;,&#x00BB;" />
-            <Key
-                latin:keySpec="\?"
-                latin:moreKeys="!text/morekeys_question" />
-        </default>
-    </switch>
-</merge>
diff --git a/java/res/xml/keys_square_brackets.xml b/java/res/xml/keys_square_brackets.xml
deleted file mode 100644
index af78ffbe5..000000000
--- a/java/res/xml/keys_square_brackets.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <Key
-        latin:keySpec="!text/keyspec_left_square_bracket" />
-    <Key
-        latin:keySpec="!text/keyspec_right_square_bracket" />
-</merge>
diff --git a/java/res/xml/keystyle_devanagari_sign_anusvara.xml b/java/res/xml/keystyle_devanagari_sign_anusvara.xml
deleted file mode 100644
index f42e525e5..000000000
--- a/java/res/xml/keystyle_devanagari_sign_anusvara.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2013, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- The code point U+25CC for key label is needed because the font rendering system prior to
-     API version 16 can't automatically render dotted circle for incomplete combining letter
-     of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
-     counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <switch>
-        <case latin:keyboardLayoutSet="hindi_compact">
-            <!-- U+25CC: "◌" DOTTED CIRCLE
-                 U+0903: "ः‍" DEVANAGARI SIGN VISARGA
-                 U+0901: "ँ" DEVANAGARI SIGN CANDRABINDU
-                 U+093C: "़" DEVANAGARI SIGN NUKTA -->
-            <key-style
-                latin:styleName="moreKeysDevanagariSignAnusvara"
-                latin:moreKeys="&#x25CC;&#x0903;|&#x0903;,&#x25CC;&#x0901;|&#x0901;,&#x25CC;&#x093C;|&#x093C;" />
-        </case>
-        <case latin:keyboardLayoutSet="marathi">
-            <!-- U+25CC: "◌" DOTTED CIRCLE
-                 U+0903: "ः‍" DEVANAGARI SIGN VISARGA
-                 U+0901: "ँ" DEVANAGARI SIGN CANDRABINDU -->
-            <key-style
-                latin:styleName="moreKeysDevanagariSignAnusvara"
-                latin:moreKeys="&#x25CC;&#x0903;|&#x0903;,&#x25CC;&#x0901;|&#x0901;" />
-        </case>
-        <default>
-            <key-style latin:styleName="moreKeysDevanagariSignAnusvara" />
-        </default>
-    </switch>
-    <!-- U+25CC: "◌" DOTTED CIRCLE
-         U+0902: "ं" DEVANAGARI SIGN ANUSVARA -->
-    <key-style
-        latin:styleName="baseKeyDevanagariSignAnusvara"
-        latin:parentStyle="moreKeysDevanagariSignAnusvara"
-        latin:keySpec="&#x25CC;&#x0902;|&#x0902;"
-        latin:keyLabelFlags="followKeyLetterRatio" />
-</merge>
diff --git a/java/res/xml/keystyle_devanagari_sign_candrabindu.xml b/java/res/xml/keystyle_devanagari_sign_candrabindu.xml
deleted file mode 100644
index be48eef04..000000000
--- a/java/res/xml/keystyle_devanagari_sign_candrabindu.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2013, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- The code point U+25CC for key label is needed because the font rendering system prior to
-     API version 16 can't automatically render dotted circle for incomplete combining letter
-     of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
-     counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <switch>
-        <case latin:keyboardLayoutSet="hindi">
-            <!-- U+25CC: "◌" DOTTED CIRCLE
-                 U+0945: "ॅ" DEVANAGARI VOWEL SIGN CANDRA E -->
-            <key-style
-                latin:styleName="moreKeysDevanagariSignCandrabindu"
-                latin:moreKeys="&#x25CC;&#x0945;|&#x0945;" />
-        </case>
-        <default>
-            <key-style latin:styleName="moreKeysDevanagariSignCandrabindu" />
-        </default>
-    </switch>
-    <!-- U+25CC: "◌" DOTTED CIRCLE
-         U+0901: "ँ" DEVANAGARI SIGN CANDRABINDU -->
-    <key-style
-        latin:styleName="baseKeyDevanagariSignCandrabindu"
-        latin:parentStyle="moreKeysDevanagariSignCandrabindu"
-        latin:keySpec="&#x25CC;&#x0901;|&#x0901;"
-        latin:keyLabelFlags="followKeyLetterRatio" />
-</merge>
diff --git a/java/res/xml/keystyle_devanagari_sign_nukta.xml b/java/res/xml/keystyle_devanagari_sign_nukta.xml
deleted file mode 100644
index 66e2997a5..000000000
--- a/java/res/xml/keystyle_devanagari_sign_nukta.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2013, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- The code point U+25CC for key label is needed because the font rendering system prior to
-     API version 16 can't automatically render dotted circle for incomplete combining letter
-     of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
-     counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <switch>
-        <case latin:keyboardLayoutSet="hindi">
-            <!-- U+25CC: "◌" DOTTED CIRCLE
-                 U+097D: "ॽ" DEVANAGARI LETTER GLOTTAL STOP
-                 U+0970: "॰" DEVANAGARI ABBREVIATION SIGN
-                 U+093D: "ऽ" DEVANAGARI SIGN AVAGRAHA -->
-            <key-style
-                latin:styleName="moreKeysDevanagariSignNukta"
-                latin:moreKeys="&#x25CC;&#x097D;|&#x097D;,&#x25CC;&#x0970;|&#x0970;,&#x25CC;&#x093D;|&#x093D;" />
-        </case>
-        <case latin:keyboardLayoutSet="nepali_romanized">
-            <!-- U+25CC: "◌" DOTTED CIRCLE
-                 U+093C: "़" DEVANAGARI SIGN NUKTA -->
-            <key-style
-                latin:styleName="moreKeysDevanagariSignNukta"
-                latin:moreKeys="&#x25CC;&#x093C;|&#x093C;" />
-        </case>
-        <default>
-            <key-style latin:styleName="moreKeysDevanagariSignNukta" />
-        </default>
-    </switch>
-    <!-- U+25CC: "◌" DOTTED CIRCLE
-         U+093C: "़" DEVANAGARI SIGN NUKTA -->
-    <key-style
-        latin:styleName="baseKeyDevanagariSignNukta"
-        latin:parentStyle="moreKeysDevanagariSignNukta"
-        latin:keySpec="&#x25CC;&#x093C;|&#x093C;"
-        latin:keyLabelFlags="followKeyLetterRatio" />
-</merge>
diff --git a/java/res/xml/keystyle_devanagari_sign_virama.xml b/java/res/xml/keystyle_devanagari_sign_virama.xml
deleted file mode 100644
index 50900e139..000000000
--- a/java/res/xml/keystyle_devanagari_sign_virama.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2013, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- The code point U+25CC for key label is needed because the font rendering system prior to
-     API version 16 can't automatically render dotted circle for incomplete combining letter
-     of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
-     counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <switch>
-        <case latin:keyboardLayoutSet="hindi_compact">
-            <!-- U+25CC: "◌" DOTTED CIRCLE
-                 U+094D: "्" DEVANAGARI SIGN VIRAMA -->
-            <key-style
-                latin:styleName="moreKeySpecDevanagariSignVirama"
-                latin:moreKeys="&#x25CC;&#x094D;|&#x094D;" />
-            <!-- U+25CC: "◌" DOTTED CIRCLE
-                 U+0945: "ॅ" DEVANAGARI VOWEL SIGN CANDRA E
-                 U+090D: "ऍ" DEVANAGARI LETTER CANDRA E -->
-            <key-style
-                latin:styleName="moreKeysDevanagariSignVirama"
-                latin:moreKeys="&#x25CC;&#x0945;|&#x0945;,&#x090D;" />
-        </case>
-        <case latin:keyboardLayoutSet="marathi">
-            <!-- U+0905: "अ" DEVANAGARI LETTER A -->
-            <key-style
-                latin:styleName="moreKeysDevanagariSignVirama"
-                latin:moreKeys="&#x0905;" />
-        </case>
-        <default>
-            <key-style latin:styleName="moreKeysDevanagariSignVirama" />
-        </default>
-    </switch>
-    <!-- U+25CC: "◌" DOTTED CIRCLE
-         U+094D: "्" DEVANAGARI SIGN VIRAMA -->
-    <key-style
-        latin:styleName="baseKeyDevanagariSignVirama"
-        latin:parentStyle="moreKeysDevanagariSignVirama"
-        latin:keySpec="&#x25CC;&#x094D;|&#x094D;"
-        latin:keyLabelFlags="followKeyLetterRatio" />
-</merge>
diff --git a/java/res/xml/keystyle_devanagari_sign_visarga.xml b/java/res/xml/keystyle_devanagari_sign_visarga.xml
deleted file mode 100644
index bd90b24bf..000000000
--- a/java/res/xml/keystyle_devanagari_sign_visarga.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2013, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- The code point U+25CC for key label is needed because the font rendering system prior to
-     API version 16 can't automatically render dotted circle for incomplete combining letter
-     of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
-     counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <!-- U+25CC: "◌" DOTTED CIRCLE
-         U+0903: "ः" DEVANAGARI SIGN VISARGA -->
-    <key-style
-        latin:styleName="baseKeyDevanagariSignVisarga"
-        latin:keySpec="&#x25CC;&#x0903;|&#x0903;"
-        latin:keyLabelFlags="followKeyLetterRatio" />
-</merge>
diff --git a/java/res/xml/keystyle_devanagari_vowel_sign_aa.xml b/java/res/xml/keystyle_devanagari_vowel_sign_aa.xml
deleted file mode 100644
index e91696cba..000000000
--- a/java/res/xml/keystyle_devanagari_vowel_sign_aa.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2013, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- The code point U+25CC for key label is needed because the font rendering system prior to
-     API version 16 can't automatically render dotted circle for incomplete combining letter
-     of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
-     counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <switch>
-        <case latin:keyboardLayoutSet="hindi">
-            <!-- U+25CC: "◌" DOTTED CIRCLE
-                 U+093E/U+0902: "ां" DEVANAGARI VOWEL SIGN AA/DEVANAGARI SIGN ANUSVARA
-                 U+093E/U+0901: "ाँ" DEVANAGARI VOWEL SIGN AA/DEVANAGARI SIGN CANDRABINDU -->
-            <key-style
-                latin:styleName="moreKeysDevanagariVowelSignAa"
-                latin:moreKeys="&#x25CC;&#x093E;&#x0902;|&#x093E;&#x0902;,&#x25CC;&#x093E;&#x0901;|&#x093E;&#x0901;,%" />
-        </case>
-        <case latin:keyboardLayoutSet="hindi_compact">
-            <!-- U+25CC: "◌" DOTTED CIRCLE
-                 U+093E: "ा" DEVANAGARI VOWEL SIGN AA -->
-            <key-style
-                latin:styleName="moreKeysDevanagariVowelSignAa"
-                latin:moreKeys="&#x25CC;&#x093E;|&#x093E;,%" />
-        </case>
-        <case latin:keyboardLayoutSet="marathi">
-            <!-- U+0906: "आ" DEVANAGARI LETTER AA -->
-            <key-style
-                latin:styleName="moreKeysDevanagariVowelSignAa"
-                latin:moreKeys="&#x0906;,%" />
-        </case>
-        <default>
-            <key-style latin:styleName="moreKeysDevanagariVowelSignAa" />
-        </default>
-    </switch>
-    <!-- U+25CC: "◌" DOTTED CIRCLE
-         U+093E: "ा" DEVANAGARI VOWEL SIGN AA -->
-    <key-style
-        latin:styleName="baseKeyDevanagariVowelSignAa"
-        latin:parentStyle="moreKeysDevanagariVowelSignAa"
-        latin:keySpec="&#x25CC;&#x093E;|&#x093E;"
-        latin:keyLabelFlags="followKeyLetterRatio" />
-</merge>
diff --git a/java/res/xml/keystyle_devanagari_vowel_sign_ai.xml b/java/res/xml/keystyle_devanagari_vowel_sign_ai.xml
deleted file mode 100644
index 1b4731ee7..000000000
--- a/java/res/xml/keystyle_devanagari_vowel_sign_ai.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2013, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- The code point U+25CC for key label is needed because the font rendering system prior to
-     API version 16 can't automatically render dotted circle for incomplete combining letter
-     of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
-     counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <switch>
-        <case latin:keyboardLayoutSet="hindi">
-            <!-- U+25CC: "◌" DOTTED CIRCLE
-                 U+0948/U+0902: "ैं" DEVANAGARI VOWEL SIGN AI/DEVANAGARI SIGN ANUSVARA -->
-            <key-style
-                latin:styleName="moreKeysDevanagariVowelSignAi"
-                latin:moreKeys="&#x25CC;&#x0948;&#x0902;|&#x0948;&#x0902;,%" />
-        </case>
-        <case latin:keyboardLayoutSet="hindi_compact">
-            <!-- U+25CC: "◌" DOTTED CIRCLE
-                 U+0948: "ै" DEVANAGARI VOWEL SIGN AI -->
-            <key-style
-                latin:styleName="moreKeysDevanagariVowelSignAi"
-                latin:moreKeys="&#x25CC;&#x0948;|&#x0948;,%" />
-        </case>
-        <case latin:keyboardLayoutSet="marathi">
-            <!-- U+0910: "ऐ" DEVANAGARI LETTER AI -->
-            <key-style
-                latin:styleName="moreKeysDevanagariVowelSignAi"
-                latin:moreKeys="&#x0910;,%" />
-        </case>
-        <case latin:keyboardLayoutSet="nepali_traditional">
-            <!-- U+0936/U+094D/U+0930: "श्र" DEVANAGARI LETTER SHA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER RA -->
-            <key-style
-                latin:styleName="moreKeysDevanagariVowelSignAi"
-                latin:moreKeys="&#x0936;&#x094D;&#x0930;" />
-        </case>
-        <default>
-            <key-style latin:styleName="moreKeysDevanagariVowelSignAi" />
-        </default>
-    </switch>
-    <!-- U+25CC: "◌" DOTTED CIRCLE
-         U+0948: "ै" DEVANAGARI VOWEL SIGN AI -->
-    <key-style
-        latin:styleName="baseKeyDevanagariVowelSignAi"
-        latin:parentStyle="moreKeysDevanagariVowelSignAi"
-        latin:keySpec="&#x25CC;&#x0948;|&#x0948;"
-        latin:keyLabelFlags="followKeyLetterRatio" />
-</merge>
diff --git a/java/res/xml/keystyle_devanagari_vowel_sign_au.xml b/java/res/xml/keystyle_devanagari_vowel_sign_au.xml
deleted file mode 100644
index 743ab00ca..000000000
--- a/java/res/xml/keystyle_devanagari_vowel_sign_au.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2013, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- The code point U+25CC for key label is needed because the font rendering system prior to
-     API version 16 can't automatically render dotted circle for incomplete combining letter
-     of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
-     counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <switch>
-        <case latin:keyboardLayoutSet="hindi">
-            <!-- U+25CC: "◌" DOTTED CIRCLE
-                 U+094C/U+0902: "ौं" DEVANAGARI VOWEL SIGN AU/DEVANAGARI SIGN ANUSVARA -->
-            <key-style
-                latin:styleName="moreKeysDevanagariVowelSignAu"
-                latin:moreKeys="&#x25CC;&#x094C;&#x0902;|&#x094C;&#x0902;,%" />
-        </case>
-        <case latin:keyboardLayoutSet="hindi_compact">
-            <!-- U+25CC: "◌" DOTTED CIRCLE
-                 U+094C: "ौ" DEVANAGARI VOWEL SIGN AU -->
-            <key-style
-                latin:styleName="moreKeysDevanagariVowelSignAu"
-                latin:moreKeys="&#x25CC;&#x094C;|&#x094C;,%" />
-        </case>
-        <case latin:keyboardLayoutSet="marathi">
-            <!-- U+0914: "औ" DEVANAGARI LETTER AU -->
-            <key-style
-                latin:styleName="moreKeysDevanagariVowelSignAu"
-                latin:moreKeys="&#x0914;,%" />
-        </case>
-        <default>
-            <key-style latin:styleName="moreKeysDevanagariVowelSignAu" />
-        </default>
-    </switch>
-    <!-- U+094C: "ौ" DEVANAGARI VOWEL SIGN AU -->
-    <key-style
-        latin:styleName="baseKeyDevanagariVowelSignAu"
-        latin:parentStyle="moreKeysDevanagariVowelSignAu"
-        latin:keySpec="&#x25CC;&#x094C;|&#x094C;"
-        latin:keyLabelFlags="followKeyLetterRatio" />
-</merge>
diff --git a/java/res/xml/keystyle_devanagari_vowel_sign_candra_e.xml b/java/res/xml/keystyle_devanagari_vowel_sign_candra_e.xml
deleted file mode 100644
index 02d89710e..000000000
--- a/java/res/xml/keystyle_devanagari_vowel_sign_candra_e.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2014, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- The code point U+25CC for key label is needed because the font rendering system prior to
-     API version 16 can't automatically render dotted circle for incomplete combining letter
-     of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
-     counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <switch>
-        <case latin:keyboardLayoutSet="hindi_compact">
-            <!-- U+25CC: "◌" DOTTED CIRCLE
-                 U+0945: "ॅ" DEVANAGARI VOWEL SIGN CANDRA E -->
-            <key-style
-                latin:styleName="moreKeysDevanagariVowelSignCandraE"
-                latin:moreKeys="&#x25CC;&#x0945;|&#x0945;" />
-        </case>
-        <case latin:keyboardLayoutSet="marathi">
-            <!-- U+090D: "ऍ" DEVANAGARI LETTER CANDRA E -->
-            <key-style
-                latin:styleName="moreKeysDevanagariVowelSignCandraE"
-                latin:moreKeys="&#x090D;" />
-        </case>
-        <default>
-            <key-style latin:styleName="moreKeysDevanagariVowelSignCandraE" />
-        </default>
-    </switch>
-    <!-- U+25CC: "◌" DOTTED CIRCLE
-         U+0945: "ॅ" DEVANAGARI VOWEL SIGN CANDRA E -->
-    <key-style
-        latin:styleName="baseKeyDevanagariVowelSignCandraE"
-        latin:parentStyle="moreKeysDevanagariVowelSignCandraE"
-        latin:keySpec="&#x25CC;&#x0945;|&#x0945;"
-        latin:keyLabelFlags="followKeyLetterRatio" />
-</merge>
diff --git a/java/res/xml/keystyle_devanagari_vowel_sign_candra_o.xml b/java/res/xml/keystyle_devanagari_vowel_sign_candra_o.xml
deleted file mode 100644
index 0454a5daa..000000000
--- a/java/res/xml/keystyle_devanagari_vowel_sign_candra_o.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2013, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- The code point U+25CC for key label is needed because the font rendering system prior to
-     API version 16 can't automatically render dotted circle for incomplete combining letter
-     of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
-     counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <switch>
-        <case latin:keyboardLayoutSet="hindi_compact">
-            <!-- U+25CC: "◌" DOTTED CIRCLE
-                 U+0949: "ॉ" DEVANAGARI VOWEL SIGN CANDRA O -->
-            <key-style
-                latin:styleName="moreKeysDevanagariVowelSignCandraO"
-                latin:moreKeys="&#x25CC;&#x0949;|&#x0949;" />
-        </case>
-        <case latin:keyboardLayoutSet="marathi">
-            <!-- U+0911: "ऑ" DEVANAGARI LETTER CANDRA O -->
-            <key-style
-                latin:styleName="moreKeysDevanagariVowelSignCandraO"
-                latin:moreKeys="&#x0911;" />
-        </case>
-        <default>
-            <key-style latin:styleName="moreKeysDevanagariVowelSignCandraO" />
-        </default>
-    </switch>
-    <!-- U+25CC: "◌" DOTTED CIRCLE
-         U+0949: "ॉ" DEVANAGARI VOWEL SIGN CANDRA O -->
-    <key-style
-        latin:styleName="baseKeyDevanagariVowelSignCandraO"
-        latin:parentStyle="moreKeysDevanagariVowelSignCandraO"
-        latin:keySpec="&#x25CC;&#x0949;|&#x0949;"
-        latin:keyLabelFlags="followKeyLetterRatio" />
-</merge>
diff --git a/java/res/xml/keystyle_devanagari_vowel_sign_e.xml b/java/res/xml/keystyle_devanagari_vowel_sign_e.xml
deleted file mode 100644
index 4e15e1cb1..000000000
--- a/java/res/xml/keystyle_devanagari_vowel_sign_e.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2013, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- The code point U+25CC for key label is needed because the font rendering system prior to
-     API version 16 can't automatically render dotted circle for incomplete combining letter
-     of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
-     counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <switch>
-        <case latin:keyboardLayoutSet="hindi">
-            <!-- U+25CC: "◌" DOTTED CIRCLE
-                 U+0947/U+0902: "ें" DEVANAGARI VOWEL SIGN E/DEVANAGARI SIGN ANUSVARA -->
-            <key-style
-                latin:styleName="moreKeysDevanagariVowelSignE"
-                latin:moreKeys="&#x25CC;&#x0947;&#x0902;|&#x0947;&#x0902;" />
-        </case>
-        <case latin:keyboardLayoutSet="hindi_compact">
-            <!-- U+25CC: "◌" DOTTED CIRCLE
-                 U+0947: "े" DEVANAGARI VOWEL SIGN E -->
-            <key-style
-                latin:styleName="moreKeysDevanagariVowelSignE"
-                latin:moreKeys="&#x25CC;&#x0947;|&#x0947;" />
-        </case>
-        <case latin:keyboardLayoutSet="marathi">
-            <!-- U+090F: "ए" DEVANAGARI LETTER SHORT E -->
-            <key-style
-                latin:styleName="moreKeysDevanagariVowelSignE"
-                latin:moreKeys="&#x090F;" />
-        </case>
-        <case latin:keyboardLayoutSet="nepali_traditional">
-            <!-- U+25CC: "◌" DOTTED CIRCLE
-                 U+0903: "ः‍" DEVANAGARI SIGN VISARGA
-                 U+093D: "ऽ" DEVANAGARI SIGN AVAGRAHA -->
-            <key-style
-                latin:styleName="moreKeysDevanagariVowelSignE"
-                latin:moreKeys="&#x25CC;&#x0903;|&#x0903;,&#x093D;" />
-        </case>
-        <default>
-            <key-style latin:styleName="moreKeysDevanagariVowelSignE" />
-        </default>
-    </switch>
-    <!-- U+25CC: "◌" DOTTED CIRCLE
-         U+0947: "े" DEVANAGARI VOWEL SIGN E -->
-    <key-style
-        latin:styleName="baseKeyDevanagariVowelSignE"
-        latin:parentStyle="moreKeysDevanagariVowelSignE"
-        latin:keySpec="&#x25CC;&#x0947;|&#x0947;"
-        latin:keyLabelFlags="followKeyLetterRatio" />
-</merge>
diff --git a/java/res/xml/keystyle_devanagari_vowel_sign_i.xml b/java/res/xml/keystyle_devanagari_vowel_sign_i.xml
deleted file mode 100644
index a25d01b3b..000000000
--- a/java/res/xml/keystyle_devanagari_vowel_sign_i.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2013, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- The code point U+25CC for key label is needed because the font rendering system prior to
-     API version 16 can't automatically render dotted circle for incomplete combining letter
-     of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
-     counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <switch>
-        <case latin:keyboardLayoutSet="hindi">
-            <!-- U+25CC: "◌" DOTTED CIRCLE
-                 U+093F/U+0902: "िं" DEVANAGARI VOWEL SIGN I/DEVANAGARI SIGN ANUSVARA -->
-            <key-style
-                latin:styleName="moreKeysDevanagariVowelSignI"
-                latin:moreKeys="&#x093F;&#x25CC;&#x0902;|&#x093F;&#x0902;" />
-        </case>
-        <case latin:keyboardLayoutSet="hindi_compact">
-            <!-- U+25CC: "◌" DOTTED CIRCLE
-                 U+093F: "ि" DEVANAGARI VOWEL SIGN I -->
-            <key-style
-                latin:styleName="moreKeysDevanagariVowelSignI"
-                latin:moreKeys="&#x25CC;&#x093F;|&#x093F;" />
-        </case>
-        <case latin:keyboardLayoutSet="marathi">
-            <!-- U+0907: "इ" DEVANAGARI LETTER I -->
-            <key-style
-                latin:styleName="moreKeysDevanagariVowelSignI"
-                latin:moreKeys="&#x0907;" />
-        </case>
-        <default>
-            <key-style latin:styleName="moreKeysDevanagariVowelSignI" />
-        </default>
-    </switch>
-    <!-- U+25CC: "◌" DOTTED CIRCLE
-         U+093F: "ि" DEVANAGARI VOWEL SIGN I -->
-    <key-style
-        latin:styleName="baseKeyDevanagariVowelSignI"
-        latin:parentStyle="moreKeysDevanagariVowelSignI"
-        latin:keySpec="&#x25CC;&#x093F;|&#x093F;"
-        latin:keyLabelFlags="followKeyLetterRatio" />
-</merge>
diff --git a/java/res/xml/keystyle_devanagari_vowel_sign_ii.xml b/java/res/xml/keystyle_devanagari_vowel_sign_ii.xml
deleted file mode 100644
index 8399a70f2..000000000
--- a/java/res/xml/keystyle_devanagari_vowel_sign_ii.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2013, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- The code point U+25CC for key label is needed because the font rendering system prior to
-     API version 16 can't automatically render dotted circle for incomplete combining letter
-     of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
-     counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <switch>
-        <case latin:keyboardLayoutSet="hindi">
-            <!-- U+25CC: "◌" DOTTED CIRCLE
-                 U+0940/U+0902: "ीं" DEVANAGARI VOWEL SIGN II/DEVANAGARI SIGN ANUSVARA -->
-            <key-style
-                latin:styleName="moreKeysDevanagariVowelSignIi"
-                latin:moreKeys="&#x25CC;&#x0940;&#x0902;|&#x0940;&#x0902;,%" />
-        </case>
-        <case latin:keyboardLayoutSet="hindi_compact">
-            <!-- U+25CC: "◌" DOTTED CIRCLE
-                 U+0940: "ी" DEVANAGARI VOWEL SIGN II -->
-            <key-style
-                latin:styleName="moreKeysDevanagariVowelSignIi"
-                latin:moreKeys="&#x25CC;&#x0940;|&#x0940;,%" />
-        </case>
-        <case latin:keyboardLayoutSet="marathi">
-            <!-- U+0908: "ई" DEVANAGARI LETTER II -->
-            <key-style
-                latin:styleName="moreKeysDevanagariVowelSignIi"
-                latin:moreKeys="&#x0908;,%" />
-        </case>
-        <default>
-            <key-style latin:styleName="moreKeysDevanagariVowelSignIi" />
-        </default>
-    </switch>
-    <!-- U+25CC: "◌" DOTTED CIRCLE
-         U+0940: "ी" DEVANAGARI VOWEL SIGN II -->
-    <key-style
-        latin:styleName="baseKeyDevanagariVowelSignIi"
-        latin:parentStyle="moreKeysDevanagariVowelSignIi"
-        latin:keySpec="&#x25CC;&#x0940;|&#x0940;"
-        latin:keyLabelFlags="followKeyLetterRatio" />
-</merge>
diff --git a/java/res/xml/keystyle_devanagari_vowel_sign_o.xml b/java/res/xml/keystyle_devanagari_vowel_sign_o.xml
deleted file mode 100644
index 374cb599c..000000000
--- a/java/res/xml/keystyle_devanagari_vowel_sign_o.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2013, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- The code point U+25CC for key label is needed because the font rendering system prior to
-     API version 16 can't automatically render dotted circle for incomplete combining letter
-     of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
-     counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <switch>
-        <case latin:keyboardLayoutSet="hindi">
-            <!-- U+25CC: "◌" DOTTED CIRCLE
-                 U+094B/U+0902: "ों" DEVANAGARI VOWEL SIGN O/DEVANAGARI SIGN ANUSVARA
-                 U+0949: "ॉ" DEVANAGARI VOWEL SIGN CANDRA O
-                 U+094A: "ॊ" DEVANAGARI VOWEL SIGN SHORT O -->
-            <key-style
-                latin:styleName="moreKeysDevanagariVowelSignO"
-                latin:moreKeys="&#x25CC;&#x094B;&#x0902;|&#x094B;&#x0902;,&#x25CC;&#x0949;|&#x0949;,&#x25CC;&#x094A;|&#x094A;" />
-        </case>
-        <case latin:keyboardLayoutSet="hindi_compact">
-            <!-- U+25CC: "◌" DOTTED CIRCLE
-                 U+094B: "ो" DEVANAGARI VOWEL SIGN O -->
-            <key-style
-                latin:styleName="moreKeysDevanagariVowelSignO"
-                latin:moreKeys="&#x25CC;&#x094B;|&#x094B;" />
-        </case>
-        <case latin:keyboardLayoutSet="marathi">
-            <!-- U+0913: "ओ" DEVANAGARI LETTER O -->
-            <key-style
-                latin:styleName="moreKeysDevanagariVowelSignO"
-                latin:moreKeys="&#x0913;" />
-        </case>
-        <default>
-            <key-style latin:styleName="moreKeysDevanagariVowelSignO" />
-        </default>
-    </switch>
-    <!-- U+25CC: "◌" DOTTED CIRCLE
-         U+094B: "ो" DEVANAGARI VOWEL SIGN O -->
-    <key-style
-        latin:styleName="baseKeyDevanagariVowelSignO"
-        latin:parentStyle="moreKeysDevanagariVowelSignO"
-        latin:keySpec="&#x25CC;&#x094B;|&#x094B;"
-        latin:keyLabelFlags="followKeyLetterRatio" />
-</merge>
diff --git a/java/res/xml/keystyle_devanagari_vowel_sign_u.xml b/java/res/xml/keystyle_devanagari_vowel_sign_u.xml
deleted file mode 100644
index e0b1e0e06..000000000
--- a/java/res/xml/keystyle_devanagari_vowel_sign_u.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2013, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- The code point U+25CC for key label is needed because the font rendering system prior to
-     API version 16 can't automatically render dotted circle for incomplete combining letter
-     of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
-     counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <switch>
-        <case latin:keyboardLayoutSet="hindi">
-            <!-- U+25CC: "◌" DOTTED CIRCLE
-                 U+0941/U+0902: "ुं" DEVANAGARI VOWEL SIGN U/DEVANAGARI SIGN ANUSVARA
-                 U+0941/U+0901: "ुँ" DEVANAGARI VOWEL SIGN U/DEVANAGARI SIGN CANDRABINDU -->
-            <key-style
-                latin:styleName="moreKeysDevanagariVowelSignU"
-                latin:moreKeys="&#x25CC;&#x0941;&#x0902;|&#x0941;&#x0902;,&#x25CC;&#x0941;&#x0901;|&#x0941;&#x0901;" />
-        </case>
-        <case latin:keyboardLayoutSet="hindi_compact">
-            <!-- U+25CC: "◌" DOTTED CIRCLE
-                 U+0941: "ु" DEVANAGARI VOWEL SIGN U -->
-            <key-style
-                latin:styleName="moreKeysDevanagariVowelSignU"
-                latin:moreKeys="&#x25CC;&#x0941;|&#x0941;" />
-        </case>
-        <case latin:keyboardLayoutSet="marathi">
-            <!-- U+0909: "उ" DEVANAGARI LETTER U -->
-            <key-style
-                latin:styleName="moreKeysDevanagariVowelSignU"
-                latin:moreKeys="&#x0909;" />
-        </case>
-        <default>
-            <key-style latin:styleName="moreKeysDevanagariVowelSignU" />
-        </default>
-    </switch>
-    <!-- U+25CC: "◌" DOTTED CIRCLE
-         U+0941: "ु" DEVANAGARI VOWEL SIGN U -->
-    <key-style
-        latin:styleName="baseKeyDevanagariVowelSignU"
-        latin:parentStyle="moreKeysDevanagariVowelSignU"
-        latin:keySpec="&#x25CC;&#x0941;|&#x0941;"
-        latin:keyLabelFlags="followKeyLetterRatio" />
-</merge>
diff --git a/java/res/xml/keystyle_devanagari_vowel_sign_uu.xml b/java/res/xml/keystyle_devanagari_vowel_sign_uu.xml
deleted file mode 100644
index abdc4d6fd..000000000
--- a/java/res/xml/keystyle_devanagari_vowel_sign_uu.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2013, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- The code point U+25CC for key label is needed because the font rendering system prior to
-     API version 16 can't automatically render dotted circle for incomplete combining letter
-     of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
-     counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <switch>
-        <case latin:keyboardLayoutSet="hindi">
-            <!-- U+25CC: "◌" DOTTED CIRCLE
-                 U+0942/U+0902: "ूं" DEVANAGARI VOWEL SIGN UU/DEVANAGARI SIGN ANUSVARA
-                 U+0942/U+0901: "ूँ" DEVANAGARI VOWEL SIGN UU/DEVANAGARI SIGN CANDRABINDU -->
-            <key-style
-                latin:styleName="moreKeysDevanagariVowelSignUu"
-                latin:moreKeys="&#x25CC;&#x0942;&#x0902;|&#x0942;&#x0902;,&#x25CC;&#x0942;&#x0901;|&#x0942;&#x0901;,%" />
-        </case>
-        <case latin:keyboardLayoutSet="hindi_compact">
-            <!-- U+25CC: "◌" DOTTED CIRCLE
-                 U+0942: "ू" DEVANAGARI VOWEL SIGN UU -->
-            <key-style
-                latin:styleName="moreKeysDevanagariVowelSignUu"
-                latin:moreKeys="&#x25CC;&#x0942;|&#x0942;,%" />
-        </case>
-        <case latin:keyboardLayoutSet="marathi">
-            <!-- U+090A: "ऊ" DEVANAGARI LETTER UU -->
-            <key-style
-                latin:styleName="moreKeysDevanagariVowelSignUu"
-                latin:moreKeys="&#x090A;,%" />
-        </case>
-        <default>
-            <key-style latin:styleName="moreKeysDevanagariVowelSignUu" />
-        </default>
-    </switch>
-    <!-- U+25CC: "◌" DOTTED CIRCLE
-         U+0942: "ू" DEVANAGARI VOWEL SIGN UU -->
-    <key-style
-        latin:styleName="baseKeyDevanagariVowelSignUu"
-        latin:parentStyle="moreKeysDevanagariVowelSignUu"
-        latin:keySpec="&#x25CC;&#x0942;|&#x0942;"
-        latin:keyLabelFlags="followKeyLetterRatio" />
-</merge>
diff --git a/java/res/xml/keystyle_devanagari_vowel_sign_vocalic_r.xml b/java/res/xml/keystyle_devanagari_vowel_sign_vocalic_r.xml
deleted file mode 100644
index 1381b3f0e..000000000
--- a/java/res/xml/keystyle_devanagari_vowel_sign_vocalic_r.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2013, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- The code point U+25CC for key label is needed because the font rendering system prior to
-     API version 16 can't automatically render dotted circle for incomplete combining letter
-     of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
-     counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <switch>
-        <case latin:keyboardLayoutSet="hindi">
-            <!-- U+25CC: "◌" DOTTED CIRCLE
-                 U+0944: "ॄ" DEVANAGARI VOWEL SIGN VOCALIC RR -->
-            <key-style
-                latin:styleName="moreKeysDevanagariVowelSignVocalicR"
-                latin:moreKeys="&#x25CC;&#x0944;|&#x0944;" />
-        </case>
-        <case latin:keyboardLayoutSet="hindi_compact">
-            <!-- U+090B: "ऋ" DEVANAGARI LETTER VOCALIC R
-                 U+25CC: "◌" DOTTED CIRCLE
-                 U+0943: "ृ" DEVANAGARI VOWEL SIGN VOCALIC R -->
-            <key-style
-                latin:styleName="moreKeysDevanagariVowelSignVocalicR"
-                latin:moreKeys="&#x090B;,&#x25CC;&#x0943;|&#x0943;" />
-        </case>
-        <case latin:keyboardLayoutSet="marathi">
-            <!-- U+0931: "ऱ" DEVANAGARI LETTER RRA
-                 U+090B: "ऋ" DEVANAGARI LETTER VOCALIC R
-                 U+25CC: "◌" DOTTED CIRCLE
-                 U+0943: "ृ" DEVANAGARI VOWEL SIGN VOCALIC R -->
-            <key-style
-                latin:styleName="moreKeysDevanagariVowelSignVocalicR"
-                latin:moreKeys="&#x0931;,&#x090B;,&#x25CC;&#x0943;|&#x0943;" />
-        </case>
-        <case latin:keyboardLayoutSet="nepali_traditional">
-            <!-- U+0913: "ओ" DEVANAGARI LETTER O -->
-            <key-style
-                latin:styleName="moreKeysDevanagariVowelSignVocalicR"
-                latin:moreKeys="&#x0913;" />
-        </case>
-        <default>
-            <key-style latin:styleName="moreKeysDevanagariVowelSignVocalicR" />
-        </default>
-    </switch>
-    <!-- U+25CC: "◌" DOTTED CIRCLE
-         U+0943: "ृ" DEVANAGARI VOWEL SIGN VOCALIC R -->
-    <key-style
-        latin:styleName="baseKeyDevanagariVowelSignVocalicR"
-        latin:parentStyle="moreKeysDevanagariVowelSignVocalicR"
-        latin:keySpec="&#x25CC;&#x0943;|&#x0943;"
-        latin:keyLabelFlags="followKeyLetterRatio" />
-</merge>
diff --git a/java/res/xml/row_number_arabic_switch.xml b/java/res/xml/row_number_arabic_switch.xml
deleted file mode 100644
index e57fcbc6b..000000000
--- a/java/res/xml/row_number_arabic_switch.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <switch>
-        <case latin:numberRow="true">
-            <Row
-                latin:keyWidth="10%p"
-                >
-                <include
-                    latin:keyboardLayout="@xml/rowkeys_numbers_arabic" />
-            </Row>
-        </case>
-        <default>
-
-        </default>
-    </switch>
-</merge>
diff --git a/java/res/xml/row_number_switch.xml b/java/res/xml/row_number_switch.xml
deleted file mode 100644
index 892e70c9c..000000000
--- a/java/res/xml/row_number_switch.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <switch>
-        <case latin:numberRow="true">
-            <Row
-                latin:keyWidth="10%p"
-                >
-                <include
-                    latin:keyboardLayout="@xml/rowkeys_numbers" />
-            </Row>
-        </case>
-        <default>
-
-        </default>
-    </switch>
-</merge>
diff --git a/java/res/xml/row_pcqwerty5.xml b/java/res/xml/row_pcqwerty5.xml
deleted file mode 100644
index e265738fa..000000000
--- a/java/res/xml/row_pcqwerty5.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <Row
-        latin:keyWidth="7.692%p"
-    >
-        <switch>
-            <case
-                latin:clobberSettingsKey="false"
-            >
-                <Key
-                    latin:keyStyle="settingsKeyStyle"
-                    latin:keyWidth="11.538%p" />
-            </case>
-        </switch>
-        <switch>
-            <case
-                latin:bottomEmojiKeyEnabled="true"
-            >
-                <Key
-                    latin:keyStyle="bottomEmojiKeyStyle"
-                    latin:keyXPos="19.231%p"
-                    latin:keyWidth="11.538%p" />
-                <Key
-                    latin:keyStyle="spaceKeyStyle"
-                    latin:keyWidth="42.308%p" />
-            </case>
-            <!-- bottomEmojiKeyEnabled="false" -->
-            <default>
-                <Key
-                    latin:keyStyle="spaceKeyStyle"
-                    latin:keyXPos="26.923%p"
-                    latin:keyWidth="46.154%p" />
-            </default>
-        </switch>
-        <Key
-            latin:keyStyle="enterKeyStyle"
-            latin:keyXPos="-19.231%p"
-            latin:keyWidth="fillRight" />
-    </Row>
-</merge>
diff --git a/java/res/xml/row_qwerty4.xml b/java/res/xml/row_qwerty4.xml
deleted file mode 100644
index 15f0b38db..000000000
--- a/java/res/xml/row_qwerty4.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2010, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <Row
-        latin:keyWidth="10%p"
-    >
-        <Key
-            latin:keyStyle="toSymbolKeyStyle"
-            latin:keyWidth="15%p" />
-        <include
-            latin:keyboardLayout="@xml/key_comma" />
-        <include
-            latin:keyXPos="25%p"
-            latin:keyboardLayout="@xml/key_space_5kw" />
-        <include
-            latin:keyboardLayout="@xml/key_period" />
-        <Key
-            latin:keyStyle="enterKeyStyle"
-            latin:keyWidth="fillRight" />
-    </Row>
-</merge>
diff --git a/java/res/xml/row_symbols4.xml b/java/res/xml/row_symbols4.xml
deleted file mode 100644
index 5d63403d9..000000000
--- a/java/res/xml/row_symbols4.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto" >
-    <Key
-        latin:keySpec="!text/keyspec_comma" />
-    <Key
-        latin:keySpec="_" />
-    <include
-        latin:keyboardLayout="@xml/key_space_symbols" />
-    <Key
-        latin:keySpec="/" />
-    <!-- U+2026: "…" HORIZONTAL ELLIPSIS -->
-    <Key
-        latin:keySpec="."
-        latin:moreKeys="&#x2026;" />
-</merge>
diff --git a/java/res/xml/row_symbols_shift4.xml b/java/res/xml/row_symbols_shift4.xml
deleted file mode 100644
index c0e4194c6..000000000
--- a/java/res/xml/row_symbols_shift4.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto" >
-    <include
-        latin:keyboardLayout="@xml/key_styles_less_greater" />
-    <Key
-        latin:keySpec="!text/keyspec_comma" />
-    <Key
-        latin:keyStyle="lessKeyStyle" />
-    <include
-        latin:keyboardLayout="@xml/key_space_symbols" />
-    <Key
-        latin:keyStyle="greaterKeyStyle" />
-    <!-- U+2026: "…" HORIZONTAL ELLIPSIS -->
-    <Key
-        latin:keySpec="."
-        latin:moreKeys="&#x2026;" />
-</merge>
diff --git a/java/res/xml/rowkeys_arabic1.xml b/java/res/xml/rowkeys_arabic1.xml
deleted file mode 100644
index 211186146..000000000
--- a/java/res/xml/rowkeys_arabic1.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <!-- U+0636: "ض" ARABIC LETTER DAD
-         U+0661: "١" ARABIC-INDIC DIGIT ONE -->
-    <Key
-        latin:keySpec="&#x0636;"
-        latin:keyHintLabel="1"
-        latin:additionalMoreKeys="1,&#x0661;" />
-    <!-- U+0635: "ص" ARABIC LETTER SAD
-         U+0662: "٢" ARABIC-INDIC DIGIT TWO -->
-    <Key
-        latin:keySpec="&#x0635;"
-        latin:keyHintLabel="2"
-        latin:additionalMoreKeys="2,&#x0662;" />
-    <!-- U+062B: "ث" ARABIC LETTER THEH
-         U+0663: "٣" ARABIC-INDIC DIGIT THREE -->
-    <Key
-        latin:keySpec="&#x062B;"
-        latin:keyHintLabel="3"
-        latin:additionalMoreKeys="3,&#x0663;" />
-    <!-- U+0642: "ق" ARABIC LETTER QAF
-         U+0664: "٤" ARABIC-INDIC DIGIT FOUR
-         U+06A8: "ڨ" ARABIC LETTER QAF WITH THREE DOTS ABOVE -->
-    <!-- TODO: DroidSansArabic lacks the glyph of U+06A8 ARABIC LETTER QAF WITH THREE DOTS ABOVE -->
-    <Key
-        latin:keySpec="&#x0642;"
-        latin:keyHintLabel="4"
-        latin:additionalMoreKeys="4,&#x0664;"
-        latin:moreKeys="&#x06A8;" />
-    <!-- U+0641: "ف" ARABIC LETTER FEH
-         U+0665: "٥" ARABIC-INDIC DIGIT FIVE
-         U+06A4: "ڤ" ARABIC LETTER VEH
-         U+06A2: "ڢ" ARABIC LETTER FEH WITH DOT MOVED BELOW
-         U+06A5: "ڥ" ARABIC LETTER FEH WITH THREE DOTS BELOW -->
-    <!-- TODO: DroidSansArabic lacks the glyph of U+06A2 ARABIC LETTER FEH WITH DOT MOVED BELOW -->
-    <!-- TODO: DroidSansArabic lacks the glyph of U+06A5 ARABIC LETTER FEH WITH THREE DOTS BELOW -->
-    <Key
-        latin:keySpec="&#x0641;"
-        latin:keyHintLabel="5"
-        latin:additionalMoreKeys="5,&#x0665;"
-        latin:moreKeys="&#x06A4;,&#x06A2;,&#x06A5;" />
-    <!-- U+063A: "غ" ARABIC LETTER GHAIN
-         U+0666: "٦" ARABIC-INDIC DIGIT SIX -->
-    <Key
-        latin:keySpec="&#x063A;"
-        latin:keyHintLabel="6"
-        latin:additionalMoreKeys="6,&#x0666;" />
-    <!-- U+0639: "ع" ARABIC LETTER AIN
-         U+0667: "٧" ARABIC-INDIC DIGIT SEVEN -->
-    <Key
-        latin:keySpec="&#x0639;"
-        latin:keyHintLabel="7"
-        latin:additionalMoreKeys="7,&#x0667;" />
-    <!-- U+0647: "ه" ARABIC LETTER HEH
-         U+0668: "٨" ARABIC-INDIC DIGIT EIGHT
-         U+FEEB: "ﻫ" ARABIC LETTER HEH INITIAL FORM
-         U+0647 U+200D: ARABIC LETTER HEH + ZERO WIDTH JOINER -->
-    <Key
-        latin:keySpec="&#x0647;"
-        latin:keyHintLabel="8"
-        latin:additionalMoreKeys="8,&#x0668;"
-        latin:moreKeys="&#xFEEB;|&#x0647;&#x200D;" />
-    <!-- U+062E: "خ" ARABIC LETTER KHAH
-         U+0669: "٩" ARABIC-INDIC DIGIT NINE -->
-    <Key
-        latin:keySpec="&#x062E;"
-        latin:keyHintLabel="9"
-        latin:additionalMoreKeys="9,&#x0669;" />
-    <!-- U+062D: "ح" ARABIC LETTER HAH
-         U+0660: "٠" ARABIC-INDIC DIGIT ZERO -->
-    <Key
-        latin:keySpec="&#x062D;"
-        latin:keyHintLabel="0"
-        latin:additionalMoreKeys="0,&#x0660;" />
-    <!-- U+062C: "ج" ARABIC LETTER JEEM
-         U+0686: "چ" ARABIC LETTER TCHEH -->
-    <Key
-        latin:keySpec="&#x062C;"
-        latin:moreKeys="&#x0686;" />
-</merge>
diff --git a/java/res/xml/rowkeys_arabic2.xml b/java/res/xml/rowkeys_arabic2.xml
deleted file mode 100644
index 1f0b42f3d..000000000
--- a/java/res/xml/rowkeys_arabic2.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <!-- U+0634: "ش" ARABIC LETTER SHEEN
-         U+069C: "ڜ" ARABIC LETTER SEEN WITH THREE DOTS BELOW AND THREE DOTS ABOVE -->
-    <!-- TODO: DroidSansArabic lacks the glyph of U+069C ARABIC LETTER SEEN WITH THREE DOTS BELOW AND THREE DOTS ABOVE -->
-    <Key
-        latin:keySpec="&#x0634;"
-        latin:moreKeys="&#x069C;" />
-    <!-- U+0633: "س" ARABIC LETTER SEEN -->
-    <Key latin:keySpec="&#x0633;" />
-    <!-- U+064A: "ي" ARABIC LETTER YEH
-         U+0626: "ئ" ARABIC LETTER YEH WITH HAMZA ABOVE
-         U+0649: "ى" ARABIC LETTER ALEF MAKSURA -->
-    <Key
-        latin:keySpec="&#x064A;"
-        latin:moreKeys="&#x0626;,&#x0649;" />
-    <!-- U+0628: "ب" ARABIC LETTER BEH
-         U+067E: "پ" ARABIC LETTER PEH -->
-    <Key
-        latin:keySpec="&#x0628;"
-        latin:moreKeys="&#x067E;" />
-    <!-- U+0644: "ل" ARABIC LETTER LAM
-         U+FEFB: "ﻻ" ARABIC LIGATURE LAM WITH ALEF ISOLATED FORM
-         U+0627: "ا" ARABIC LETTER ALEF
-         U+FEF7: "ﻷ" ARABIC LIGATURE LAM WITH ALEF WITH HAMZA ABOVE ISOLATED FORM
-         U+0623: "أ" ARABIC LETTER ALEF WITH HAMZA ABOVE
-         U+FEF9: "ﻹ" ARABIC LIGATURE LAM WITH ALEF WITH HAMZA BELOW ISOLATED FORM
-         U+0625: "إ" ARABIC LETTER ALEF WITH HAMZA BELOW
-         U+FEF5: "ﻵ" ARABIC LIGATURE LAM WITH ALEF WITH MADDA ABOVE ISOLATED FORM
-         U+0622: "آ" ARABIC LETTER ALEF WITH MADDA ABOVE -->
-    <Key
-        latin:keySpec="&#x0644;"
-        latin:moreKeys="&#xFEFB;|&#x0644;&#x0627;,&#xFEF7;|&#x0644;&#x0623;,&#xFEF9;|&#x0644;&#x0625;,&#xFEF5;|&#x0644;&#x0622;" />
-    <!-- U+0627: "ا" ARABIC LETTER ALEF
-         U+0622: "آ" ARABIC LETTER ALEF WITH MADDA ABOVE
-         U+0621: "ء" ARABIC LETTER HAMZA
-         U+0623: "أ" ARABIC LETTER ALEF WITH HAMZA ABOVE
-         U+0625: "إ" ARABIC LETTER ALEF WITH HAMZA BELOW
-         U+0671: "ٱ" ARABIC LETTER ALEF WASLA -->
-    <Key
-        latin:keySpec="&#x0627;"
-        latin:moreKeys="!fixedColumnOrder!5,&#x0622;,&#x0621;,&#x0623;,&#x0625;,&#x0671;" />
-    <!-- U+062A: "ت" ARABIC LETTER TEH -->
-    <Key latin:keySpec="&#x062A;" />
-    <!-- U+0646: "ن" ARABIC LETTER NOON -->
-    <Key latin:keySpec="&#x0646;" />
-    <!-- U+0645: "م" ARABIC LETTER MEEM -->
-    <Key latin:keySpec="&#x0645;" />
-    <!-- U+0643: "ك" ARABIC LETTER KAF
-         U+06AF: "گ" ARABIC LETTER GAF
-         U+06A9: "ک" ARABIC LETTER KEHEH -->
-    <Key
-        latin:keySpec="&#x0643;"
-        latin:moreKeys="&#x06AF;,&#x06A9;" />
-    <!-- U+0637: "ط" ARABIC LETTER TAH -->
-    <Key latin:keySpec="&#x0637;" />
-</merge>
diff --git a/java/res/xml/rowkeys_arabic3.xml b/java/res/xml/rowkeys_arabic3.xml
deleted file mode 100644
index c6abfb800..000000000
--- a/java/res/xml/rowkeys_arabic3.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <include latin:keyboardLayout="@xml/keys_arabic3_left" />
-    <!-- U+0621: "ء" ARABIC LETTER HAMZA -->
-    <Key latin:keySpec="&#x0621;" />
-    <!-- U+0624: "ؤ" ARABIC LETTER WAW WITH HAMZA ABOVE -->
-    <Key latin:keySpec="&#x0624;" />
-    <!-- U+0631: "ر" ARABIC LETTER REH -->
-    <Key latin:keySpec="&#x0631;" />
-    <!-- U+0649: "ى" ARABIC LETTER ALEF MAKSURA
-         U+0626: "ئ" ARABIC LETTER YEH WITH HAMZA ABOVE -->
-    <Key
-        latin:keySpec="&#x0649;"
-        latin:moreKeys="&#x0626;" />
-    <!-- U+0629: "ة" ARABIC LETTER TEH MARBUTA -->
-    <Key latin:keySpec="&#x0629;" />
-    <!-- U+0648: "و" ARABIC LETTER WAW -->
-    <Key latin:keySpec="&#x0648;" />
-    <!-- U+0632: "ز" ARABIC LETTER ZAIN
-         U+0698: "ژ" ARABIC LETTER JEH -->
-    <Key
-        latin:keySpec="&#x0632;"
-        latin:moreKeys="&#x0698;" />
-    <!-- U+0638: "ظ" ARABIC LETTER ZAH -->
-    <Key latin:keySpec="&#x0638;" />
-    <!-- U+062F: "د" ARABIC LETTER DAL -->
-    <Key latin:keySpec="&#x062F;" />
-</merge>
diff --git a/java/res/xml/rowkeys_armenian_phonetic1.xml b/java/res/xml/rowkeys_armenian_phonetic1.xml
deleted file mode 100644
index 6289d3c1b..000000000
--- a/java/res/xml/rowkeys_armenian_phonetic1.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2013, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <!-- U+0567: "է" ARMENIAN SMALL LETTER EH -->
-    <Key
-        latin:keySpec="&#x0567;"
-        latin:keyHintLabel="1"
-        latin:additionalMoreKeys="1" />
-    <!-- U+0569: "թ" ARMENIAN SMALL LETTER TO -->
-    <Key
-        latin:keySpec="&#x0569;"
-        latin:keyHintLabel="2"
-        latin:additionalMoreKeys="2" />
-    <!-- U+0583: "փ" ARMENIAN SMALL LETTER PIWR -->
-    <Key
-        latin:keySpec="&#x0583;"
-        latin:keyHintLabel="3"
-        latin:additionalMoreKeys="3" />
-    <!-- U+0571: "ձ" ARMENIAN SMALL LETTER JA -->
-    <Key
-        latin:keySpec="&#x0571;"
-        latin:keyHintLabel="4"
-        latin:additionalMoreKeys="4" />
-    <!-- U+057B: "ջ" ARMENIAN SMALL LETTER JHEH -->
-    <Key
-        latin:keySpec="&#x057B;"
-        latin:keyHintLabel="5"
-        latin:additionalMoreKeys="5" />
-    <!-- U+0580: "ր" ARMENIAN SMALL LETTER REH -->
-    <Key
-        latin:keySpec="&#x0580;"
-        latin:keyHintLabel="6"
-        latin:additionalMoreKeys="6" />
-    <!-- U+0579: "չ" ARMENIAN SMALL LETTER CHA -->
-    <Key
-        latin:keySpec="&#x0579;"
-        latin:keyHintLabel="7"
-        latin:additionalMoreKeys="7" />
-    <!-- U+0573: "ճ" ARMENIAN SMALL LETTER CHEH -->
-    <Key
-        latin:keySpec="&#x0573;"
-        latin:keyHintLabel="8"
-        latin:additionalMoreKeys="8" />
-    <!-- U+056A: "ժ" ARMENIAN SMALL LETTER ZHE -->
-    <Key
-        latin:keySpec="&#x056A;"
-        latin:keyHintLabel="9"
-        latin:additionalMoreKeys="9" />
-    <!-- U+056E: "ծ" ARMENIAN SMALL LETTER CA -->
-    <Key
-        latin:keySpec="&#x056E;"
-        latin:keyHintLabel="0"
-        latin:additionalMoreKeys="0" />
-</merge>
diff --git a/java/res/xml/rowkeys_armenian_phonetic2.xml b/java/res/xml/rowkeys_armenian_phonetic2.xml
deleted file mode 100644
index 174468e53..000000000
--- a/java/res/xml/rowkeys_armenian_phonetic2.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2013, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <!-- U+0584: "ք" ARMENIAN SMALL LETTER KEH -->
-    <Key latin:keySpec="&#x0584;" />
-    <!-- U+0578: "ո" ARMENIAN SMALL LETTER VO -->
-    <Key latin:keySpec="&#x0578;" />
-    <!-- U+0565: "ե" ARMENIAN SMALL LETTER ECH
-         U+0587: "և" ARMENIAN SMALL LIGATURE ECH YIWN -->
-    <Key
-        latin:keySpec="&#x0565;"
-        latin:moreKeys="&#x0587;"
-        latin:keyHintLabel="&#x0587;" />
-    <!-- U+057C: "ռ" ARMENIAN SMALL LETTER RA -->
-    <Key latin:keySpec="&#x057C;" />
-    <!-- U+057F: "տ" ARMENIAN SMALL LETTER TIWN -->
-    <Key latin:keySpec="&#x057F;" />
-    <!-- U+0568: "ը" ARMENIAN SMALL LETTER ET -->
-    <Key latin:keySpec="&#x0568;" />
-    <!-- U+0582: "ւ" ARMENIAN SMALL LETTER YIWN -->
-    <Key latin:keySpec="&#x0582;" />
-    <!-- U+056B: "ի" ARMENIAN SMALL LETTER INI -->
-    <Key latin:keySpec="&#x056B;" />
-    <!-- U+0585: "օ" ARMENIAN SMALL LETTER OH -->
-    <Key latin:keySpec="&#x0585;" />
-    <!-- U+057A: "պ" ARMENIAN SMALL LETTER PEH -->
-    <Key latin:keySpec="&#x057A;" />
-</merge>
diff --git a/java/res/xml/rowkeys_armenian_phonetic3.xml b/java/res/xml/rowkeys_armenian_phonetic3.xml
deleted file mode 100644
index fe911b5c3..000000000
--- a/java/res/xml/rowkeys_armenian_phonetic3.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2013, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <!-- U+0561: "ա" ARMENIAN SMALL LETTER AYB -->
-    <Key latin:keySpec="&#x0561;" />
-    <!-- U+057D: "ս" ARMENIAN SMALL LETTER SEH -->
-    <Key latin:keySpec="&#x057D;" />
-    <!-- U+0564: "դ" ARMENIAN SMALL LETTER DA -->
-    <Key latin:keySpec="&#x0564;" />
-    <!-- U+0586: "ֆ" ARMENIAN SMALL LETTER FEH -->
-    <Key latin:keySpec="&#x0586;" />
-    <!-- U+0563: "գ" ARMENIAN SMALL LETTER GIM -->
-    <Key latin:keySpec="&#x0563;" />
-    <!-- U+0570: "հ" ARMENIAN SMALL LETTER HO -->
-    <Key latin:keySpec="&#x0570;" />
-    <!-- U+0575: "յ" ARMENIAN SMALL LETTER YI -->
-    <Key latin:keySpec="&#x0575;" />
-    <!-- U+056F: "կ" ARMENIAN SMALL LETTER KEN -->
-    <Key latin:keySpec="&#x056F;" />
-    <!-- U+056C: "լ" ARMENIAN SMALL LETTER LIWN -->
-    <Key latin:keySpec="&#x056C;" />
-</merge>
diff --git a/java/res/xml/rowkeys_armenian_phonetic4.xml b/java/res/xml/rowkeys_armenian_phonetic4.xml
deleted file mode 100644
index 4436dc428..000000000
--- a/java/res/xml/rowkeys_armenian_phonetic4.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2013, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <!-- U+0566: "զ" ARMENIAN SMALL LETTER ZA -->
-    <Key latin:keySpec="&#x0566;" />
-    <!-- U+0572: "ղ" ARMENIAN SMALL LETTER GHAD -->
-    <Key latin:keySpec="&#x0572;" />
-    <!-- U+0581: "ց" ARMENIAN SMALL LETTER CO -->
-    <Key latin:keySpec="&#x0581;" />
-    <!-- U+057E: "վ" ARMENIAN SMALL LETTER VEW -->
-    <Key latin:keySpec="&#x057E;" />
-    <!-- U+0562: "բ" ARMENIAN SMALL LETTER BEN -->
-    <Key latin:keySpec="&#x0562;" />
-    <!-- U+0576: "ն" ARMENIAN SMALL LETTER NOW -->
-    <Key latin:keySpec="&#x0576;" />
-    <!-- U+0574: "մ" ARMENIAN SMALL LETTER MEN -->
-    <Key latin:keySpec="&#x0574;" />
-</merge>
diff --git a/java/res/xml/rowkeys_azerty1.xml b/java/res/xml/rowkeys_azerty1.xml
deleted file mode 100644
index 0f858c025..000000000
--- a/java/res/xml/rowkeys_azerty1.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <!-- a, z, e, r, t -->
-    <Key
-        latin:keySpec="a"
-        latin:moreKeys="!text/number_1,!text/qwertysyms_q,!text/morekeys_a" />
-    <Key
-        latin:keySpec="z"
-        latin:moreKeys="!text/number_2,!text/qwertysyms_w,!text/morekeys_z" />
-    <Key
-        latin:keySpec="e"
-        latin:moreKeys="!text/number_3,!text/qwertysyms_e,!text/morekeys_e" />
-    <Key
-        latin:keySpec="r"
-        latin:moreKeys="!text/number_4,!text/qwertysyms_r,!text/morekeys_r" />
-    <Key
-        latin:keySpec="t"
-        latin:moreKeys="!text/number_5,!text/qwertysyms_t,!text/morekeys_t" />
-
-    <!-- y, u, i, o, p -->
-    <include
-        latin:keyboardLayout="@xml/rowkeys_qwerty1_right5" />
-</merge>
diff --git a/java/res/xml/rowkeys_azerty2.xml b/java/res/xml/rowkeys_azerty2.xml
deleted file mode 100644
index 2b091f8cf..000000000
--- a/java/res/xml/rowkeys_azerty2.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <Key
-        latin:keySpec="!text/keyspec_q"
-        latin:moreKeys="!text/morekeys_q,!text/qwertysyms_a" />
-    <Key
-        latin:keySpec="s"
-        latin:moreKeys="!text/morekeys_s,!text/qwertysyms_s" />
-    <Key
-        latin:keySpec="d"
-        latin:moreKeys="!text/morekeys_d,!text/qwertysyms_d" />
-    <Key
-        latin:keySpec="f"
-        latin:moreKeys="!text/morekeys_f,!text/qwertysyms_f" />
-    <Key
-        latin:keySpec="g"
-        latin:moreKeys="!text/morekeys_g,!text/qwertysyms_g" />
-    <Key
-        latin:keySpec="h"
-        latin:moreKeys="!text/morekeys_h,!text/qwertysyms_h" />
-    <Key
-        latin:keySpec="j"
-        latin:moreKeys="!text/morekeys_j,!text/qwertysyms_j" />
-    <Key
-        latin:keySpec="k"
-        latin:moreKeys="!text/morekeys_k,!text/qwertysyms_k" />
-    <Key
-        latin:keySpec="l"
-        latin:moreKeys="!text/morekeys_l,!text/qwertysyms_l" />
-    <Key
-        latin:keySpec="m"
-        latin:moreKeys="!text/morekeys_m,!text/qwertysyms_m" />
-</merge>
diff --git a/java/res/xml/rowkeys_azerty3.xml b/java/res/xml/rowkeys_azerty3.xml
deleted file mode 100644
index 027ea823e..000000000
--- a/java/res/xml/rowkeys_azerty3.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <Key
-        latin:keySpec="w"
-        latin:moreKeys="!text/morekeys_w,!text/qwertysyms_z" />
-    <Key
-        latin:keySpec="x"
-        latin:moreKeys="!text/morekeys_x,!text/qwertysyms_x" />
-    <Key
-        latin:keySpec="c"
-        latin:moreKeys="!text/morekeys_c,!text/qwertysyms_c" />
-    <Key
-        latin:keySpec="v"
-        latin:moreKeys="!text/morekeys_v,!text/qwertysyms_v" />
-    <Key
-        latin:keySpec="b"
-        latin:moreKeys="!text/morekeys_b,!text/qwertysyms_b" />
-    <Key
-        latin:keySpec="n"
-        latin:moreKeys="!text/morekeys_n,!text/qwertysyms_n" />
-    <switch>
-        <case
-            latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLockShifted"
-        >
-            <Key
-                latin:keySpec="\?" />
-        </case>
-        <default>
-            <Key
-                latin:keySpec="\'"
-                latin:moreKeys="!text/morekeys_single_quote" />
-        </default>
-    </switch>
-</merge>
diff --git a/java/res/xml/rowkeys_bengali1.xml b/java/res/xml/rowkeys_bengali1.xml
deleted file mode 100644
index a1530262b..000000000
--- a/java/res/xml/rowkeys_bengali1.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2014, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <!-- U+0994: "ঔ" BENGALI LETTER AU
-         U+09CC: "ৌ" BENGALI VOWEL SIGN AU
-         U+09E7: "১" BENGALI DIGIT ONE -->
-    <Key
-        latin:keySpec="&#x0994;"
-        latin:keyHintLabel="&#x09E7;"
-        latin:additionalMoreKeys="&#x09CC;,&#x09E7;,1" />
-    <!-- U+0990: "ঐ" BENGALI LETTER AI
-         U+09C8: "ৈ" BENGALI VOWEL SIGN AI
-         U+09E8: "২" BENGALI DIGIT TWO -->
-    <Key
-        latin:keySpec="&#x0990;"
-        latin:keyHintLabel="&#x09E8;"
-        latin:additionalMoreKeys="&#x09C8;,&#x09E8;,2" />
-    <!-- U+0986: "আ" BENGALI LETTER AA
-         U+09BE: "া" BENGALI VOWEL SIGN AA
-         U+09E9: "৩" BENGALI DIGIT THREE -->
-    <Key
-        latin:keySpec="&#x0986;"
-        latin:keyHintLabel="&#x09E9;"
-        latin:additionalMoreKeys="&#x09BE;,&#x09E9;,3" />
-    <!-- U+0988: "ঈ" BENGALI LETTER II
-         U+09C0: "ী" BENGALI VOWEL SIGN II
-         U+09EA: "৪" BENGALI DIGIT FOUR -->
-    <Key
-        latin:keySpec="&#x0988;"
-        latin:keyHintLabel="&#x09EA;"
-        latin:additionalMoreKeys="&#x09C0;,&#x09EA;,4" />
-    <!-- U+098A: "ঊ" BENGALI LETTER UU
-         U+09C2: "ূ" BENGALI VOWEL SIGN UU
-         U+09EB: "৫" BENGALI DIGIT FIVE -->
-    <Key
-        latin:keySpec="&#x098A;"
-        latin:keyHintLabel="&#x09EB;"
-        latin:additionalMoreKeys="&#x09C2;,&#x09EB;,5" />
-    <!-- U+09AC: "ব" BENGALI LETTER BA
-         U+09AD: "ভ" BENGALI LETTER BHA
-         U+09EC: "৬" BENGALI DIGIT SIX -->
-    <Key
-        latin:keySpec="&#x09AC;"
-        latin:moreKeys="&#x09AD;,%"
-        latin:keyHintLabel="&#x09EC;"
-        latin:additionalMoreKeys="&#x09EC;,6" />
-    <!-- U+09B9: "হ" BENGALI LETTER HA
-         U+09ED: "৭" BENGALI DIGIT SEVEN -->
-    <Key
-        latin:keySpec="&#x09B9;"
-        latin:keyHintLabel="&#x09ED;"
-        latin:additionalMoreKeys="&#x09ED;,7" />
-    <!-- U+0997: "গ" BENGALI LETTER GA
-         U+0998: "ঘ" BENGALI LETTER GHA
-         U+09EE: "৮" BENGALI DIGIT EIGHT -->
-    <Key
-        latin:keySpec="&#x0997;"
-        latin:moreKeys="&#x0998;,%"
-        latin:keyHintLabel="&#x09EE;"
-        latin:additionalMoreKeys="&#x09EE;,8" />
-    <!-- U+09A6: "দ" BENGALI LETTER DA
-         U+09A7: "ধ" BENGALI LETTER DHA
-         U+09EF: "৯" BENGALI DIGIT NINE -->
-    <Key
-        latin:keySpec="&#x09A6;"
-        latin:moreKeys="&#x09A7;,%"
-        latin:keyHintLabel="&#x09EF;"
-        latin:additionalMoreKeys="&#x09EF;,9" />
-    <!-- U+099C: "জ" BENGALI LETTER JA
-         U+099D: "ঝ" BENGALI LETTER JHA
-         U+099C/U+09CD/U+099E: "জ্ঞ" BENGALI LETTER JA/BENGALI SIGN VIRAMA/BENGALI LETTER NYA
-         U+09E6: "০" BENGALI DIGIT ZERO -->
-    <Key
-        latin:keySpec="&#x099C;"
-        latin:moreKeys="&#x099D;,&#x099C;&#x09CD;&#x099E;,%"
-        latin:keyHintLabel="&#x09E6;"
-        latin:additionalMoreKeys="&#x09E6;,0" />
-    <!-- U+09A1: "ড" BENGALI LETTER DDA
-         U+09A1/U+09BC: "ড়" BENGALI LETTER DDA/BENGALI SIGN NUKTA -->
-    <Key
-        latin:keySpec="&#x09A1;"
-        latin:moreKeys="&#x09A1;&#x09BC;" />
-</merge>
diff --git a/java/res/xml/rowkeys_bengali2.xml b/java/res/xml/rowkeys_bengali2.xml
deleted file mode 100644
index 8908201e0..000000000
--- a/java/res/xml/rowkeys_bengali2.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2014, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <!-- U+0993: "ও" BENGALI LETTER O
-         U+09CB: "ো" BENGALI VOWEL SIGN O -->
-    <Key
-        latin:keySpec="&#x0993;"
-        latin:moreKeys="&#x09CB;" />
-    <!-- U+098F: "এ" BENGALI LETTER E
-         U+09C7: "ে" BENGALI VOWEL SIGN E -->
-    <Key
-        latin:keySpec="&#x098F;"
-        latin:moreKeys="&#x09C7;" />
-    <!-- U+0985: "অ" BENGALI LETTER A
-         U+09CD: "্" BENGALI SIGN VIRAMA -->
-    <Key
-        latin:keySpec="&#x0985;"
-        latin:moreKeys="&#x09CD;" />
-    <!-- U+0987: "ই" BENGALI LETTER I
-         U+09BF: "ি" BENGALI VOWEL SIGN I -->
-    <Key
-        latin:keySpec="&#x0987;"
-        latin:moreKeys="&#x09BF;" />
-    <!-- U+0989: "উ" BENGALI LETTER U
-         U+09C1: "ু" BENGALI VOWEL SIGN U -->
-    <Key
-        latin:keySpec="&#x0989;"
-        latin:moreKeys="&#x09C1;" />
-    <!-- U+09AA: "প" BENGALI LETTER PA
-         U+09AB: "ফ" BENGALI LETTER PHA -->
-    <Key
-        latin:keySpec="&#x09AA;"
-        latin:moreKeys="&#x09AB;" />
-    <!-- U+09B0: "র" BENGALI LETTER RA
-         U+09C3: "ৃ" BENGALI VOWEL SIGN VOCALIC R
-         U+098B: "ঋ" BENGALI LETTER VOCALIC R
-         U+09A4/U+09CD/U+09B0: "ত্র" BENGALI LETTER TA/BENGALI SIGN VIRAMA/BENGALI LETTER RA -->
-    <Key
-        latin:keySpec="&#x09B0;"
-        latin:moreKeys="&#x09C3;,&#x098B;,&#x09A4;&#x09CD;&#x09B0;" />
-    <!-- U+0995: "ক" BENGALI LETTER KA
-         U+0996: "খ" BENGALI LETTER KHA -->
-    <Key
-        latin:keySpec="&#x0995;"
-        latin:moreKeys="&#x0996;" />
-    <!-- U+09A4: "ত" BENGALI LETTER TA
-         U+09CE: "ৎ" BENGALI LETTER KHANDA TA
-         U+09A5: "থ" BENGALI LETTER THA
-         U+09A4/U+09CD/U+09A4: "ত্ত" BENGALI LETTER TA/BENGALI SIGN VIRAMA/BENGALI LETTER TA -->
-    <Key
-        latin:keySpec="&#x09A4;"
-        latin:moreKeys="&#x09CE;,&#x09A5;,&#x09A4;&#x09CD;&#x09A4;" />
-    <!-- U+099A: "চ" BENGALI LETTER CA
-         U+099B: "ছ" BENGALI LETTER CHA -->
-    <Key
-        latin:keySpec="&#x099A;"
-        latin:moreKeys="&#x099B;" />
-    <!-- U+099F: "ট" BENGALI LETTER TTA
-         U+09A0: "ঠ" BENGALI LETTER TTHA -->
-    <Key
-        latin:keySpec="&#x099F;"
-        latin:moreKeys="&#x09A0;" />
-</merge>
diff --git a/java/res/xml/rowkeys_bengali3.xml b/java/res/xml/rowkeys_bengali3.xml
deleted file mode 100644
index 12fad6d12..000000000
--- a/java/res/xml/rowkeys_bengali3.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2014, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <!-- U+0981: "ঁ" BENGALI SIGN CANDRABINDU
-         U+0983: "ঃ" BENGALI SIGN VISARGA
-         U+0982: "ং" BENGALI SIGN ANUSVARA -->
-    <Key
-        latin:keySpec="&#x0981;"
-        latin:moreKeys="&#x0983;,&#x0982;" />
-    <!-- U+09A2: "ঢ" BENGALI LETTER DDHA
-         U+09A2/U+09BC: "ঢ়" BENGALI LETTER DDHA/BENGALI SIGN NUKTA -->
-    <Key
-        latin:keySpec="&#x09A2;"
-        latin:moreKeys="&#x09A2;&#x09BC;" />
-    <!-- U+09AE: "ম" BENGALI LETTER MA -->
-    <Key latin:keySpec="&#x09AE;" />
-    <!-- U+09A8: "ন" BENGALI LETTER NA
-         U+09A3: "ণ" BENGALI LETTER NNA -->
-    <Key
-        latin:keySpec="&#x09A8;"
-        latin:moreKeys="&#x09A3;" />
-    <!-- U+099E: "ঞ" BENGALI LETTER NYA
-         U+0999: "ঙ" BENGALI LETTER NGA
-         U+099E/U+09CD/U+099C: "ঞ্জ" BENGALI LETTER NYA/BENGALI SIGN VIRAMA/BENGALI LETTER JA -->
-    <Key
-        latin:keySpec="&#x099E;"
-        latin:moreKeys="&#x0999;,&#x099E;&#x09CD;&#x099C;" />
-    <!-- U+09B2: "ল" BENGALI LETTER LA -->
-    <Key latin:keySpec="&#x09B2;" />
-    <!-- U+09B7: "ষ" BENGALI LETTER SSA
-         U+0995/U+09CD/U+09B7: "ক্ষ" BENGALI LETTER KA/BENGALI SIGN VIRAMA/BENGALI LETTER SSA -->
-    <Key
-        latin:keySpec="&#x09B7;"
-        latin:moreKeys="&#x0995;&#x09CD;&#x09B7;" />
-    <!-- U+09B8: "স" BENGALI LETTER SA
-         U+09B6: "শ" BENGALI LETTER SHA -->
-    <Key
-        latin:keySpec="&#x09B8;"
-        latin:moreKeys="&#x09B6;" />
-    <!-- U+09DF: "য়" BENGALI LETTER YYA
-         U+09AF: "য" BENGALI LETTER YA -->
-    <Key
-        latin:keySpec="&#x09DF;"
-        latin:moreKeys="&#x09AF;" />
-    <!-- U+0964: "।" DEVANAGARI DANDA
-         U+0965: "॥" DEVANAGARI DOUBLE DANDA -->
-    <Key
-        latin:keySpec="&#x0964;"
-        latin:moreKeys="&#x0965;" />
-</merge>
diff --git a/java/res/xml/rowkeys_bengali_akkhor1.xml b/java/res/xml/rowkeys_bengali_akkhor1.xml
deleted file mode 100644
index 30b09da71..000000000
--- a/java/res/xml/rowkeys_bengali_akkhor1.xml
+++ /dev/null
@@ -1,183 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2014, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <switch>
-        <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
-            <!-- U+09A2: "ঢ" BENGALI LETTER DDHA -->
-            <Key latin:keySpec="&#x09A2;" />
-            <!-- U+09A0: "ঠ" BENGALI LETTER TTHA -->
-            <Key latin:keySpec="&#x09A0;" />
-            <!-- U+09C8: "ৈ" BENGALI VOWEL SIGN AI
-                 U+0990: "ঐ" BENGALI LETTER AI -->
-            <Key
-                latin:keySpec="&#x09C8;"
-                latin:moreKeys="&#x0990;" />
-            <!-- U+09DC: "ড়" BENGALI LETTER RRA
-                 U+09BC: "়" BENGALI SIGN NUKTA -->
-            <Key
-                latin:keySpec="&#x09DC;"
-                latin:moreKeys="&#x09BC;" />
-            <!-- U+099F: "ট" BENGALI LETTER TTA
-                 U+09F3: "৳" BENGALI RUPEE SIGN
-                 U+099F/U+09CD/U+099F: "ট্ট" BENGALI LETTER TTA/BENGALI SIGN VIRAMA/BENGALI LETTER TTA
-                 U+099F/U+09CD/U+09AC: "ট্ব" BENGALI LETTER TTA/BENGALI SIGN VIRAMA/BENGALI LETTER BA
-                 U+099F/U+09CD/U+09AE: "ট্ম" BENGALI LETTER TTA/BENGALI SIGN VIRAMA/BENGALI LETTER MA -->
-            <Key
-                latin:keySpec="&#x099F;"
-                latin:moreKeys="&#x09F3;,&#x099F;&#x09CD;&#x099F;,&#x099F;&#x09CD;&#x09AC;,&#x099F;&#x09CD;&#x09AE;" />
-            <!-- U+099E: "ঞ" BENGALI LETTER NYA
-                 U+099E/U+09CD/U+099A: "ঞ্চ" BENGALI LETTER NYA/BENGALI SIGN VIRAMA/BENGALI LETTER CA
-                 U+099E/U+09CD/U+099B: "ঞ্ছ" BENGALI LETTER NYA/BENGALI SIGN VIRAMA/BENGALI LETTER CHA
-                 U+099E/U+09CD/U+099C: "ঞ্জ" BENGALI LETTER NYA/BENGALI SIGN VIRAMA/BENGALI LETTER JA -->
-            <Key
-                latin:keySpec="&#x099E;"
-                latin:moreKeys="&#x099E;&#x09CD;&#x099A;,&#x099E;&#x09CD;&#x099B;,&#x099E;&#x09CD;&#x099C;" />
-            <!-- U+09C2: "ূ" BENGALI VOWEL SIGN UU
-                 U+098A: "ঊ" BENGALI LETTER UU -->
-            <Key
-                latin:keySpec="&#x09C2;"
-                latin:moreKeys="&#x098A;" />
-            <!-- U+09C0: "ী" BENGALI VOWEL SIGN II
-                 U+0988: "ঈ" BENGALI LETTER II -->
-            <Key
-                latin:keySpec="&#x09C0;"
-                latin:moreKeys="&#x0988;" />
-            <!-- U+09CC: "ৌ" BENGALI VOWEL SIGN AU
-                 U+099A: "ঔ" BENGALI LETTER CA
-                 U+09D7: "ৗ" BENGALI AU LENGTH MARK -->
-            <Key
-                latin:keySpec="&#x09CC;"
-                latin:moreKeys="&#x099A;,&#x09D7;" />
-            <!-- U+09AB: "ফ" BENGALI LETTER PHA
-                 U+09AB/U+09CD/U+099F: "ফ্ট" BENGALI LETTER PHA/BENGALI SIGN VIRAMA/BENGALI LETTER TTA
-                 U+09AB/U+09CD/U+09AF: "ফ্য" BENGALI LETTER PHA/BENGALI SIGN VIRAMA/BENGALI LETTER YA
-                 U+09AB/U+09CD/U+09B0: "ফ্র" BENGALI LETTER PHA/BENGALI SIGN VIRAMA/BENGALI LETTER RA
-                 U+09AB/U+09CD/U+09B2: "ফ্ল" BENGALI LETTER PHA/BENGALI SIGN VIRAMA/BENGALI LETTER LA -->
-            <Key
-                latin:keySpec="&#x09AB;"
-                latin:moreKeys="&#x09AB;&#x09CD;&#x099F;,&#x09AB;&#x09CD;&#x09AF;,&#x09AB;&#x09CD;&#x09B0;,&#x09AB;&#x09CD;&#x09B2;" />
-            <!-- U+098B: "ঋ" BENGALI LETTER VOCALIC R
-                 U+098C: "ঌ" BENGALI LETTER VOCALIC L
-                 U+09E1: "ৡ" BENGALI LETTER VOCALIC LL
-                 U+09F4: "৴" BENGALI CURRENCY NUMERATOR ONE
-                 U+09F5: "৵" BENGALI CURRENCY NUMERATOR TWO
-                 U+09F6: "৶" BENGALI CURRENCY NUMERATOR THREE
-                 U+09E2: " ৢ" BENGALI VOWEL SIGN VOCALIC L
-                 U+09E3: " ৣ" BENGALI VOWEL SIGN VOCALIC LL -->
-            <Key
-                latin:keySpec="&#x098B;"
-                latin:moreKeys="&#x098C;,&#x09E1;,&#x09F4;,&#x09F5;,&#x09F6;,&#x09E2;,&#x09E3;" />
-        </case>
-        <default>
-            <!-- U+09A7: "ধ" BENGALI LETTER DHA
-                 U+09E7: "১" BENGALI DIGIT ONE
-                 U+09A7/U+09CD/U+09AC: "ধ্ব্র" BENGALI LETTER DHA/BENGALI SIGN VIRAMA/BENGALI LETTER BA
-                 U+09A7/U+09CD/U+09AF: "ধ্য্র" BENGALI LETTER DHA/BENGALI SIGN VIRAMA/BENGALI LETTER YA
-                 U+09A7/U+09CD/U+09B0: "ধ্র" BENGALI LETTER DHA/BENGALI SIGN VIRAMA/BENGALI LETTER RA -->
-            <Key
-                latin:keySpec="&#x09A7;"
-                latin:keyHintLabel="&#x09E7;"
-                latin:additionalMoreKeys="&#x09E7;"
-                latin:moreKeys="&#x09A7;&#x09CD;&#x09AC;,&#x09A7;&#x09CD;&#x09AF;,&#x09A7;&#x09CD;&#x09B0;" />
-            <!-- U+09A5: "থ" BENGALI LETTER THA
-                 U+09E8: "২" BENGALI DIGIT TWO
-                 U+09A5/U+09CD/U+09AF: "থ্য" BENGALI LETTER THA/BENGALI SIGN VIRAMA/BENGALI LETTER YA
-                 U+09A5/U+09CD/U+09B0: "থ্র" BENGALI LETTER THA/BENGALI SIGN VIRAMA/BENGALI LETTER RA -->
-            <Key
-                latin:keySpec="&#x09A5;"
-                latin:keyHintLabel="&#x09E8;"
-                latin:additionalMoreKeys="&#x09E8;"
-                latin:moreKeys="&#x09A5;&#x09CD;&#x09AF;,&#x09A5;&#x09CD;&#x09B0;" />
-            <!-- U+09C7: "ে" BENGALI VOWEL SIGN E
-                 U+09E9: "৩" BENGALI DIGIT THREE
-                 U+098F: "এ" BENGALI LETTER E -->
-            <Key
-                latin:keySpec="&#x09C7;"
-                latin:keyHintLabel="&#x09E9;"
-                latin:additionalMoreKeys="&#x09E9;"
-                latin:moreKeys="&#x098F;" />
-            <!-- U+09B0: "র" BENGALI LETTER RA
-                 U+09EA: "৪" BENGALI DIGIT FOUR -->
-            <Key
-                latin:keySpec="&#x09B0;"
-                latin:keyHintLabel="&#x09EA;"
-                latin:additionalMoreKeys="&#x09EA;" />
-            <!-- U+09A4: "ত" BENGALI LETTER TA
-                 U+09EB: "৫" BENGALI DIGIT FIVE
-                 U+09CE: "ৎ" BENGALI LETTER KHANDA TA
-                 U+09A4/U+09CD/U+09A4: "ত্ত" BENGALI LETTER TA/BENGALI SIGN VIRAMA/BENGALI LETTER TA
-                 U+09A4/U+09CD/U+09A8: "ত্ন" BENGALI LETTER TA/BENGALI SIGN VIRAMA/BENGALI LETTER NA
-                 U+09A4/U+09CD/U+09AC: "ত্ব" BENGALI LETTER TA/BENGALI SIGN VIRAMA/BENGALI LETTER BA
-                 U+09A4/U+09CD/U+09AE: "ত্ম" BENGALI LETTER TA/BENGALI SIGN VIRAMA/BENGALI LETTER MA -->
-            <Key
-                latin:keySpec="&#x09A4;"
-                latin:keyHintLabel="&#x09EB;"
-                latin:additionalMoreKeys="&#x09EB;"
-                latin:moreKeys="&#x09CE;,&#x09A4;&#x09CD;&#x09A4;,&#x09A4;&#x09CD;&#x09A8;,&#x09A4;&#x09CD;&#x09AC;,&#x09A4;&#x09CD;&#x09AE;" />
-            <!-- U+09DF: "য়" BENGALI LETTER YYA
-                 U+09EC: "৬" BENGALI DIGIT SIX -->
-            <Key
-                latin:keySpec="&#x09DF;"
-                latin:keyHintLabel="&#x09EC;"
-                latin:additionalMoreKeys="&#x09EC;" />
-            <!-- U+09C1: "ু" BENGALI VOWEL SIGN U
-                 U+09ED: "৭" BENGALI DIGIT SEVEN
-                 U+0989: "উ" BENGALI LETTER U -->
-            <Key
-                latin:keySpec="&#x09C1;"
-                latin:keyHintLabel="&#x09ED;"
-                latin:additionalMoreKeys="&#x09ED;"
-                latin:moreKeys="&#x0989;" />
-            <!-- U+09BF: "ি" BENGALI VOWEL SIGN I
-                 U+09EE: "৮" BENGALI DIGIT EIGHT
-                 U+0987: "ই BENGALI LETTER I -->
-            <Key
-                latin:keySpec="&#x09BF;"
-                latin:keyHintLabel="&#x09EE;"
-                latin:additionalMoreKeys="&#x09EE;"
-                latin:moreKeys="&#x0987;" />
-            <!-- U+09CB: "ো" BENGALI VOWEL SIGN O
-                 U+09EF: "৯" BENGALI DIGIT NINE
-                 U+0993: "ও" BENGALI LETTER O -->
-            <Key
-                latin:keySpec="&#x09CB;"
-                latin:keyHintLabel="&#x09EF;"
-                latin:additionalMoreKeys="&#x09EF;"
-                latin:moreKeys="&#x0993;" />
-            <!-- U+09AA: "প" BENGALI LETTER PA
-                 U+09E6: "০" BENGALI DIGIT ZERO
-                 U+09AA/U+09CD/U+09A4: "প্ত" BENGALI LETTER PA/BENGALI SIGN VIRAMA/BENGALI LETTER TA
-                 U+09AA/U+09CD/U+09A8: "প্ন" BENGALI LETTER PA/BENGALI SIGN VIRAMA/BENGALI LETTER NA
-                 U+09AA/U+09CD/U+09AA: "প্প" BENGALI LETTER PA/BENGALI SIGN VIRAMA/BENGALI LETTER PA
-                 U+09AA/U+09CD/U+09AF: "প্য" BENGALI LETTER PA/BENGALI SIGN VIRAMA/BENGALI LETTER YA
-                 U+09AA/U+09CD/U+09B0: "প্র" BENGALI LETTER PA/BENGALI SIGN VIRAMA/BENGALI LETTER RA
-                 U+09AA/U+09CD/U+09B2: "প্ল" BENGALI LETTER PA/BENGALI SIGN VIRAMA/BENGALI LETTER LA
-                 U+09AA/U+09CD/U+09B8: "প্স" BENGALI LETTER PA/BENGALI SIGN VIRAMA/BENGALI LETTER SA -->
-            <Key
-                latin:keySpec="&#x09AA;"
-                latin:keyHintLabel="&#x09E6;"
-                latin:additionalMoreKeys="&#x09E6;"
-                latin:moreKeys="&#x09AA;&#x09CD;&#x09A4;,&#x09AA;&#x09CD;&#x09A8;,&#x09AA;&#x09CD;&#x09AA;,&#x09AA;&#x09CD;&#x09AF;,&#x09AA;&#x09CD;&#x09B0;,&#x09AA;&#x09CD;&#x09B2;,&#x09AA;&#x09CD;&#x09B8;" />
-            <!-- U+0986: "আ" BENGALI LETTER AA -->
-            <Key latin:keySpec="&#x0986;" />
-        </default>
-    </switch>
-</merge>
diff --git a/java/res/xml/rowkeys_bengali_akkhor2.xml b/java/res/xml/rowkeys_bengali_akkhor2.xml
deleted file mode 100644
index 743dec0d4..000000000
--- a/java/res/xml/rowkeys_bengali_akkhor2.xml
+++ /dev/null
@@ -1,152 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2014, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <switch>
-        <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
-            <!-- U+0985: "অ" BENGALI LETTER A -->
-            <Key latin:keySpec="&#x0985;" />
-            <!-- U+09B6: "শ" BENGALI LETTER SHA
-                 U+09B6/U+09CD/U+099A: "শ্চ" BENGALI LETTER SHA/BENGALI SIGN VIRAMA/BENGALI LETTER CA
-                 U+09B6/U+09CD/U+099B: "শ্ছ" BENGALI LETTER SHA/BENGALI SIGN VIRAMA/BENGALI LETTER CHA
-                 U+09B6/U+09CD/U+09A4: "শ্ত" BENGALI LETTER SHA/BENGALI SIGN VIRAMA/BENGALI LETTER TA
-                 U+09B6/U+09CD/U+09A8: "শ্ন" BENGALI LETTER SHA/BENGALI SIGN VIRAMA/BENGALI LETTER NA
-                 U+09B6/U+09CD/U+09AC: "শ্ব" BENGALI LETTER SHA/BENGALI SIGN VIRAMA/BENGALI LETTER BA
-                 U+09B6/U+09CD/U+09AE: "শ্ম" BENGALI LETTER SHA/BENGALI SIGN VIRAMA/BENGALI LETTER MA
-                 U+09B6/U+09CD/U+09B0: "শ্র" BENGALI LETTER SHA/BENGALI SIGN VIRAMA/BENGALI LETTER RA
-                 U+09B6/U+09CD/U+09B2: "শ্ল" BENGALI LETTER SHA/BENGALI SIGN VIRAMA/BENGALI LETTER LA -->
-            <Key
-                latin:keySpec="&#x09B6;"
-                latin:moreKeys="&#x09B6;&#x09CD;&#x099A;,&#x09B6;&#x09CD;&#x099B;,&#x09B6;&#x09CD;&#x09A4;,&#x09B6;&#x09CD;&#x09A8;,&#x09B6;&#x09CD;&#x09AC;,&#x09B6;&#x09CD;&#x09AE;,&#x09B6;&#x09CD;&#x09B0;,&#x09B6;&#x09CD;&#x09B2;" />
-            <!-- U+09A1: "ড" BENGALI LETTER DDA
-                 U+09A1/U+09CD/U+09A1: "ড্ড" BENGALI LETTER DDA/BENGALI SIGN VIRAMA/BENGALI LETTER DDA-->
-            <Key
-                latin:keySpec="&#x09A1;"
-                latin:moreKeys="&#x09A1;&#x09CD;&#x09A1;" />
-            <!-- U+09DD: "ঢ়" BENGALI LETTER RHA -->
-            <Key latin:keySpec="&#x09DD;" />
-            <!-- U+0998: "ঘ" BENGALI LETTER GHA -->
-            <Key latin:keySpec="&#x0998;" />
-            <!-- U+09B9: "হ" BENGALI LETTER HA
-                 U+09BD: "ঽ" BENGALI SIGN AVAGRAHA
-                 U+09B9/U+09CD/U+09A3: "হ্ণ" BENGALI LETTER HA/BENGALI SIGN VIRAMA/BENGALI LETTER NNA
-                 U+09B9/U+09CD/U+09A8: "হ্ন" BENGALI LETTER HA/BENGALI SIGN VIRAMA/BENGALI LETTER NA
-                 U+09B9/U+09CD/U+09AC: "হ্ব" BENGALI LETTER HA/BENGALI SIGN VIRAMA/BENGALI LETTER BA
-                 U+09B9/U+09CD/U+09AE: "হ্ম" BENGALI LETTER HA/BENGALI SIGN VIRAMA/BENGALI LETTER MA
-                 U+09B9/U+09CD/U+09B0: "হ্র" BENGALI LETTER HA/BENGALI SIGN VIRAMA/BENGALI LETTER RA
-                 U+09B9/U+09CD/U+09B2: "হ্ল" BENGALI LETTER HA/BENGALI SIGN VIRAMA/BENGALI LETTER LA -->
-            <Key
-                latin:keySpec="&#x09B9;"
-                latin:moreKeys="&#x09BD;,&#x09B9;&#x09CD;&#x09A3;,&#x09B9;&#x09CD;&#x09A8;,&#x09B9;&#x09CD;&#x09AC;,&#x09B9;&#x09CD;&#x09AE;,&#x09B9;&#x09CD;&#x09B0;,&#x09B9;&#x09CD;&#x09B2;" />
-            <!-- U+099D: "ঝ" BENGALI LETTER JHA -->
-            <Key latin:keySpec="&#x099D;" />
-            <!-- U+0996: "খ" BENGALI LETTER KHA -->
-            <Key latin:keySpec="&#x0996;" />
-            <!-- U+09CE: "ৎ" BENGALI LETTER KHANDA TA -->
-            <Key latin:keySpec="&#x09CE;" />
-            <!-- U+0988: "ঈ" BENGALI LETTER II -->
-            <Key latin:keySpec="&#x0988;" />
-            <!-- U+098A: "ঊ" BENGALI LETTER UU -->
-            <Key latin:keySpec="&#x098A;" />
-        </case>
-        <default>
-            <!-- U+09BE: "া BENGALI VOWEL SIGN AA
-                 U+0986: "আ" BENGALI LETTER AA -->
-            <Key
-                latin:keySpec="&#x09BE;"
-                latin:moreKeys="&#x0986;" />
-            <!-- U+09B8: "স" BENGALI LETTER SA
-                 U+09B8/U+09CD/U+09AC: "স্ব" BENGALI LETTER SA/BENGALI SIGN VIRAMA/BENGALI LETTER BA
-                 U+09B8/U+09CD/U+09A4: "স্ত" BENGALI LETTER SA/BENGALI SIGN VIRAMA/BENGALI LETTER TA
-                 U+09B8/U+09CD/U+099F: "স্ট" BENGALI LETTER SA/BENGALI SIGN VIRAMA/BENGALI LETTER TTA
-                 U+09B8/U+09CD/U+0995: "স্ক" BENGALI LETTER SA/BENGALI SIGN VIRAMA/BENGALI LETTER KA
-                 U+09B8/U+09CD/U+09AA: "স্প" BENGALI LETTER SA/BENGALI SIGN VIRAMA/BENGALI LETTER PA -->
-            <Key
-                latin:keySpec="&#x09B8;"
-                latin:moreKeys="&#x09B8;&#x09CD;&#x09AC;,&#x09B8;&#x09CD;&#x09A4;,&#x09B8;&#x09CD;&#x099F;,&#x09B8;&#x09CD;&#x0995;,&#x09B8;&#x09CD;&#x09AA;" />
-            <!-- U+09A6: "দ" BENGALI LETTER DA
-                 U+09A6/U+09CD/U+09A6: "দ্দ" BENGALI LETTER DA/BENGALI SIGN VIRAMA/BENGALI LETTER DA
-                 U+09A6/U+09CD/U+09A7: "দ্ধ" BENGALI LETTER DA/BENGALI SIGN VIRAMA/BENGALI LETTER DHA
-                 U+09A6/U+09CD/U+09AC: "দ্ব" BENGALI LETTER DA/BENGALI SIGN VIRAMA/BENGALI LETTER BA
-                 U+09A6/U+09CD/U+09AD: "দ্ভ" BENGALI LETTER DA/BENGALI SIGN VIRAMA/BENGALI LETTER BHA
-                 U+09A6/U+09CD/U+09AE: "দ্ম" BENGALI LETTER DA/BENGALI SIGN VIRAMA/BENGALI LETTER MA
-                 U+09A6/U+09CD/U+09AF: "দ্য" BENGALI LETTER DA/BENGALI SIGN VIRAMA/BENGALI LETTER YA
-                 U+09A6/U+09CD/U+09B0: "দ্র" BENGALI LETTER DA/BENGALI SIGN VIRAMA/BENGALI LETTER RA -->
-            <Key
-                latin:keySpec="&#x09A6;"
-                latin:moreKeys="&#x09A6;&#x09CD;&#x09A6;,&#x09A6;&#x09CD;&#x09A7;,&#x09A6;&#x09CD;&#x09AC;,&#x09A6;&#x09CD;&#x09AD;,&#x09A6;&#x09CD;&#x09AE;,&#x09A6;&#x09CD;&#x09AF;,&#x09A6;&#x09CD;&#x09B0;" />
-            <!-- U+09C3: "ৃ" BENGALI VOWEL SIGN VOCALIC R
-                 U+098B: "ঋ" BENGALI LETTER VOCALIC R -->
-            <Key
-                latin:keySpec="&#x09C3;"
-                latin:moreKeys="&#x098B;" />
-            <!-- U+0997: "গ" BENGALI LETTER GA
-                 U+0997/U+09CD/U+09A7: "গ্ধ" BENGALI LETTER GA/BENGALI SIGN VIRAMA/BENGALI LETTER DHA
-                 U+0997/U+09CD/U+09B0: "গ্র" BENGALI LETTER GA/BENGALI SIGN VIRAMA/BENGALI LETTER RA
-                 U+0997/U+09CD/U+09B2: "গ্ল" BENGALI LETTER GA/BENGALI SIGN VIRAMA/BENGALI LETTER LA
-                 U+0997/U+09CD/U+09A8: "গ্ন" BENGALI LETTER GA/BENGALI SIGN VIRAMA/BENGALI LETTER NA -->
-            <Key
-                latin:keySpec="&#x0997;"
-                latin:moreKeys="&#x0997;&#x09CD;&#x09A7;,&#x0997;&#x09CD;&#x09B0;,&#x0997;&#x09CD;&#x09B2;,&#x0997;&#x09CD;&#x09A8;" />
-            <!-- U+09CD: "্" BENGALI SIGN VIRAMA -->
-            <Key latin:keySpec="&#x09CD;" />
-            <!-- U+099C: "জ" BENGALI LETTER JA
-                 U+099C/U+09CD/U+099E: "জ্ঞ" BENGALI LETTER JA/BENGALI SIGN VIRAMA/BENGALI LETTER NYA
-                 U+099C/U+09CD/U+099C: "জ্জ" BENGALI LETTER JA/BENGALI SIGN VIRAMA/BENGALI LETTER JA
-                 U+099C/U+09CD/U+09AF: "জ্ব" BENGALI LETTER JA/BENGALI SIGN VIRAMA/BENGALI LETTER YA
-                 U+099C/U+09CD/U+09AC: "জ্য" BENGALI LETTER JA/BENGALI SIGN VIRAMA/BENGALI LETTER BA
-                 U+099C/U+09CD/U+09B0: "জ্র" BENGALI LETTER JA/BENGALI SIGN VIRAMA/BENGALI LETTER RA -->
-            <Key
-                latin:keySpec="&#x099C;"
-                latin:moreKeys="&#x099C;&#x09CD;&#x099E;,&#x099C;&#x09CD;&#x099C;,&#x099C;&#x09CD;&#x09AF;,&#x099C;&#x09CD;&#x09AC;,&#x099C;&#x09CD;&#x09B0;" />
-            <!-- U+0995: "ক" BENGALI LETTER KA
-                 U+0995/U+09CD/U+09B7: "ক্ষ" BENGALI LETTER KA/BENGALI SIGN VIRAMA/BENGALI LETTER SSA
-                 U+0995/U+09CD/U+0995: "ক্ক" BENGALI LETTER KA/BENGALI SIGN VIRAMA/BENGALI LETTER KA
-                 U+0995/U+09CD/U+099F: "ক্ট" BENGALI LETTER KA/BENGALI SIGN VIRAMA/BENGALI LETTER TTA
-                 U+0995/U+09CD/U+09A4: "ক্ত" BENGALI LETTER KA/BENGALI SIGN VIRAMA/BENGALI LETTER TA
-                 U+0995/U+09CD/U+09B0: "ক্র" BENGALI LETTER KA/BENGALI SIGN VIRAMA/BENGALI LETTER RA
-                 U+0995/U+09CD/U+09B8: "ক্স" BENGALI LETTER KA/BENGALI SIGN VIRAMA/BENGALI LETTER SA
-                 U+0995/U+09CD/U+09B2: "ক্ল" BENGALI LETTER KA/BENGALI SIGN VIRAMA/BENGALI LETTER LA -->
-            <Key
-                latin:keySpec="&#x0995;"
-                latin:moreKeys="&#x0995;&#x09CD;&#x09B7;,&#x0995;&#x09CD;&#x0995;,&#x0995;&#x09CD;&#x099F;,&#x0995;&#x09CD;&#x09A4;,&#x0995;&#x09CD;&#x09B0;,&#x0995;&#x09CD;&#x09B8;,&#x0995;&#x09CD;&#x09B2;" />
-            <!-- U+09B2: "ল" BENGALI LETTER LA
-                 U+09B2/U+09CD/U+0995: "ল্ক" BENGALI LETTER LA/BENGALI SIGN VIRAMA/BENGALI LETTER KA
-                 U+09B2/U+09CD/U+0997: "ল্গ" BENGALI LETTER LA/BENGALI SIGN VIRAMA/BENGALI LETTER GA
-                 U+09B2/U+09CD/U+099F: "ল্ট" BENGALI LETTER LA/BENGALI SIGN VIRAMA/BENGALI LETTER TTA
-                 U+09B2/U+09CD/U+09A1: "ল্ড" BENGALI LETTER LA/BENGALI SIGN VIRAMA/BENGALI LETTER DDA
-                 U+09B2/U+09CD/U+09A4: "ল্ত" BENGALI LETTER LA/BENGALI SIGN VIRAMA/BENGALI LETTER TA
-                 U+09B2/U+09CD/U+09A6: "ল্দ" BENGALI LETTER LA/BENGALI SIGN VIRAMA/BENGALI LETTER DA
-                 U+09B2/U+09CD/U+09A7: "ল্ধ" BENGALI LETTER LA/BENGALI SIGN VIRAMA/BENGALI LETTER DHA
-                 U+09B2/U+09CD/U+09AA: "ল্প" BENGALI LETTER LA/BENGALI SIGN VIRAMA/BENGALI LETTER PA
-                 U+09B2/U+09CD/U+09AB: "ল্ফ" BENGALI LETTER LA/BENGALI SIGN VIRAMA/BENGALI LETTER PHA
-                 U+09B2/U+09CD/U+09AC: "ল্ব" BENGALI LETTER LA/BENGALI SIGN VIRAMA/BENGALI LETTER BA
-                 U+09B2/U+09CD/U+09AE: "ল্ম" BENGALI LETTER LA/BENGALI SIGN VIRAMA/BENGALI LETTER MA
-                 U+09B2/U+09CD/U+09B2: "ল্ল" BENGALI LETTER LA/BENGALI SIGN VIRAMA/BENGALI LETTER LA -->
-            <Key
-                latin:keySpec="&#x09B2;"
-                latin:moreKeys="&#x09B2;&#x09CD;&#x0995;,&#x09B2;&#x09CD;&#x0997;,&#x09B2;&#x09CD;&#x099F;,&#x09B2;&#x09CD;&#x09A1;,&#x09B2;&#x09CD;&#x09A4;,&#x09B2;&#x09CD;&#x09A6;,&#x09B2;&#x09CD;&#x09A7;,&#x09B2;&#x09CD;&#x09AA;,&#x09B2;&#x09CD;&#x09AB;,&#x09B2;&#x09CD;&#x09AC;,&#x09B2;&#x09CD;&#x09AE;,&#x09B2;&#x09CD;&#x09B2;" />
-            <!-- U+0987: "ই" BENGALI LETTER I -->
-            <Key latin:keySpec="&#x0987;" />
-            <!-- U+0989: "উ" BENGALI LETTER U -->
-            <Key latin:keySpec="&#x0989;" />
-        </default>
-    </switch>
-</merge>
diff --git a/java/res/xml/rowkeys_bengali_akkhor3.xml b/java/res/xml/rowkeys_bengali_akkhor3.xml
deleted file mode 100644
index d5bb4d1db..000000000
--- a/java/res/xml/rowkeys_bengali_akkhor3.xml
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2014, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <switch>
-        <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
-            <!-- U+0964: "।" DEVANAGARI DANDA
-                 U+0965: "॥" DEVANAGARI DOUBLE DANDA -->
-            <Key
-                 latin:keySpec="&#x0964;"
-                 latin:moreKeys="&#x0965;" />
-            <!-- U+0999: "ঙ BENGALI LETTER NGA
-                 U+0999/U+09CD/U+0995: "ঙ্ক"
-                 U+0999/U+09CD/U+0996: "ঙ্খ"
-                 U+0999/U+09CD/U+0997: "ঙ্গ" -->
-            <Key latin:keySpec="&#x0999;"
-                 latin:moreKeys="&#x0999;&#x09CD;&#x0995;,&#x0999;&#x09CD;&#x0996;,&#x0999;&#x09CD;&#x0997;" />
-            <!-- U+099B: "ছ" BENGALI LETTER CHA -->
-            <Key latin:keySpec="&#x099B;" />
-            <!-- U+0983: "ঃ" BENGALI SIGN VISARGA -->
-            <Key latin:keySpec="&#x0983;" />
-            <!-- U+0981: "ঁ" BENGALI SIGN CANDRABINDU -->
-            <Key latin:keySpec="&#x0981;" />
-            <!-- U+09A3: "ণ" BENGALI LETTER NNA
-                 U+09A3/U+09CD/U+099F: "ণ্ট" BENGALI LETTER NNA/BENGALI SIGN VIRAMA/BENGALI LETTER TTA
-                 U+09A3/U+09CD/U+09A1: "ণ্ড" BENGALI LETTER NNA/BENGALI SIGN VIRAMA/BENGALI LETTER DDA
-                 U+09A3/U+09CD/U+09A3: "ণ্ণ" BENGALI LETTER NNA/BENGALI SIGN VIRAMA/BENGALI LETTER NNA -->
-            <Key latin:keySpec="&#x09A3;"
-                 latin:moreKeys="&#x09A3;&#x09CD;&#x099F;,&#x09A3;&#x09CD;&#x09A1;,&#x09A3;&#x09CD;&#x09A3;" />
-            <!-- U+0982: "ং" BENGALI SIGN ANUSVARA -->
-            <Key latin:keySpec="&#x0982;" />
-            <!-- U+0990: "ঐ" BENGALI LETTER AI -->
-            <Key latin:keySpec="&#x0990;" />
-            <!-- U+0994: "ঔ" BENGALI LETTER AU -->
-            <Key latin:keySpec="&#x0994;" />
-        </case>
-        <default>
-            <!-- U+09AF: "য" BENGALI LETTER YA
-                 U+09CD/U+09AF: "্য" BENGALI SIGN VIRAMA/BENGALI LETTER YA -->
-            <Key
-                 latin:keySpec="&#x09AF;"
-                 latin:moreKeys="&#x09CD;&#x09AF;" />
-            <!-- U+09B7: "ষ" BENGALI LETTER SSA
-                 U+09B7/U+09CD/U+0995: "ষ্ক" BENGALI LETTER SSA/BENGALI SIGN VIRAMA/BENGALI LETTER KA
-                 U+09B7/U+09CD/U+099F: "ষ্ট" BENGALI LETTER SSA/BENGALI SIGN VIRAMA/BENGALI LETTER TTA
-                 U+09B7/U+09CD/U+09A0: "ষ্ঠ" BENGALI LETTER SSA/BENGALI SIGN VIRAMA/BENGALI LETTER TTHA
-                 U+09B7/U+09CD/U+09A3: "ষ্ণ" BENGALI LETTER SSA/BENGALI SIGN VIRAMA/BENGALI LETTER NNA
-                 U+09B7/U+09CD/U+09AA: "ষ্প" BENGALI LETTER SSA/BENGALI SIGN VIRAMA/BENGALI LETTER PA
-                 U+09B7/U+09CD/U+09AB: "ষ্ফ" BENGALI LETTER SSA/BENGALI SIGN VIRAMA/BENGALI LETTER PHA
-                 U+09B7/U+09CD/U+09AE: "ষ্ম" BENGALI LETTER SSA/BENGALI SIGN VIRAMA/BENGALI LETTER MA -->
-            <Key
-                 latin:keySpec="&#x09B7;"
-                 latin:moreKeys="&#x09B7;&#x09CD;&#x0995;,&#x09B7;&#x09CD;&#x099F;,&#x09B7;&#x09CD;&#x09A0;,&#x09B7;&#x09CD;&#x09A3;,&#x09B7;&#x09CD;&#x09AA;,&#x09B7;&#x09CD;&#x09AB;,&#x09B7;&#x09CD;&#x09AE;" />
-            <!-- U+099A: "চ" BENGALI LETTER CA
-                 U+099A/U+09CD/U+099A: "চ্চ" BENGALI LETTER CA/BENGALI SIGN VIRAMA/BENGALI LETTER CA
-                 U+099A/U+09CD/U+099B: "চ্ছ" BENGALI LETTER CA/BENGALI SIGN VIRAMA/BENGALI LETTER CHA -->
-            <Key
-                 latin:keySpec="&#x099A;"
-                 latin:moreKeys="&#x099A;&#x09CD;&#x099A;,&#x099A;&#x09CD;&#x099B;" />
-            <!-- U+09AD: "ভ" BENGALI LETTER BHA
-                 U+09AD/U+09CD/U+09AF: "ভ্" BENGALI LETTER BHA/BENGALI SIGN VIRAMA/BENGALI LETTER YA
-                 U+09AD/U+09CD/U+09B0: "ভ্র" BENGALI LETTER BHA/BENGALI SIGN VIRAMA/BENGALI LETTER RA
-                 U+09AD/U+09CD/U+09B2: "ভ্ল" BENGALI LETTER BHA/BENGALI SIGN VIRAMA/BENGALI LETTER LA -->
-            <Key
-                 latin:keySpec="&#x09AD;"
-                 latin:moreKeys="&#x09AD;&#x09CD;&#x09AF;,&#x09AD;&#x09CD;&#x09B0;,&#x09AD;&#x09CD;&#x09B2;" />
-            <!-- U+09AC: "ব" BENGALI LETTER BA
-                 U+09CD/U+09AC: "্ব" BENGALI SIGN VIRAMA/BENGALI LETTER BA
-                 U+09AC/U+09CD/U+09B0: "ব্র" BENGALI LETTER BA/BENGALI SIGN VIRAMA/BENGALI LETTER RA
-                 U+09AC/U+09CD/U+099C: "ব্জ" BENGALI LETTER BA/BENGALI SIGN VIRAMA/BENGALI LETTER JA
-                 U+09AC/U+09CD/U+09A6: "ব্দ" BENGALI LETTER BA/BENGALI SIGN VIRAMA/BENGALI LETTER DA
-                 U+09AC/U+09CD/U+09A7: "ব্ধ" BENGALI LETTER BA/BENGALI SIGN VIRAMA/BENGALI LETTER DHA
-                 U+09AC/U+09CD/U+09AC: "ব্ব" BENGALI LETTER BA/BENGALI SIGN VIRAMA/BENGALI LETTER BA
-                 U+09AC/U+09CD/U+09B2: "ব্ল" BENGALI LETTER BA/BENGALI SIGN VIRAMA/BENGALI LETTER LA
-                 U+09F1: "ৱ" BENGALI LETTER RA WITH MIDDLE DIAGONAL
-                 U+09F0: "ৰ" BENGALI LETTER RA WITH LOWER DIAGONAL -->
-            <Key
-                 latin:keySpec="&#x09AC;"
-                 latin:moreKeys="&#x09CD;&#x09AC;,&#x09AC;&#x09CD;&#x09B0;,&#x09AC;&#x09CD;&#x099C;,&#x09AC;&#x09CD;&#x09A6;,&#x09AC;&#x09CD;&#x09A7;,&#x09AC;&#x09CD;&#x09AC;,&#x09AC;&#x09CD;&#x09B2;,&#x09F1;,&#x09F0;" />
-            <!-- U+09A8: "ন" BENGALI LETTER NA
-                 U+09A8/U+09CD/U+09A4: "ন্ত" BENGALI LETTER NA/BENGALI SIGN VIRAMA/BENGALI LETTER TA
-                 U+09A8/U+09CD/U+09A5: "ন্থ" BENGALI LETTER NA/BENGALI SIGN VIRAMA/BENGALI LETTER THA
-                 U+09A8/U+09CD/U+099F: "ন্ট" BENGALI LETTER NA/BENGALI SIGN VIRAMA/BENGALI LETTER TTA
-                 U+09A8/U+09CD/U+09A6: "ন্দ" BENGALI LETTER NA/BENGALI SIGN VIRAMA/BENGALI LETTER DA
-                 U+09A8/U+09CD/U+09A7: "ন্ধ" BENGALI LETTER NA/BENGALI SIGN VIRAMA/BENGALI LETTER DHA
-                 U+09A8/U+09CD/U+09A1: "ন্ড" BENGALI LETTER NA/BENGALI SIGN VIRAMA/BENGALI LETTER DDA
-                 U+09A8/U+09CD/U+09A8: "ন্ন" BENGALI LETTER NA/BENGALI SIGN VIRAMA/BENGALI LETTER NA
-                 U+09A8/U+09CD/U+09AC: "ন্ব" BENGALI LETTER NA/BENGALI SIGN VIRAMA/BENGALI LETTER BA
-                 U+09A8/U+09CD/U+09AE: "ন্ম" BENGALI LETTER NA/BENGALI SIGN VIRAMA/BENGALI LETTER MA
-                 U+09A8/U+09CD/U+09B8: "ন্স" BENGALI LETTER NA/BENGALI SIGN VIRAMA/BENGALI LETTER SA -->
-            <Key
-                 latin:keySpec="&#x09A8;"
-                 latin:moreKeys="&#x09A8;&#x09CD;&#x09A4;,&#x09A8;&#x09CD;&#x09A5;,&#x09A8;&#x09CD;&#x099F;,&#x09A8;&#x09CD;&#x09A6;,&#x09A8;&#x09CD;&#x09A7;,&#x09A8;&#x09CD;&#x09A1;,&#x09A8;&#x09CD;&#x09A8;,&#x09A8;&#x09CD;&#x09AC;,&#x09A8;&#x09CD;&#x09AE;,&#x09A8;&#x09CD;&#x09B8;" />
-            <!-- U+09AE: "ম" BENGALI LETTER MA
-                 U+09AE/U+09CD/U+09A8: "ম্ন" BENGALI LETTER MA/BENGALI SIGN VIRAMA/BENGALI LETTER NA
-                 U+09AE/U+09CD/U+09AA: "ম্প" BENGALI LETTER MA/BENGALI SIGN VIRAMA/BENGALI LETTER PA
-                 U+09AE/U+09CD/U+09AC: "ম্ব" BENGALI LETTER MA/BENGALI SIGN VIRAMA/BENGALI LETTER BA
-                 U+09AE/U+09CD/U+09AD: "ম্ভ" BENGALI LETTER MA/BENGALI SIGN VIRAMA/BENGALI LETTER BHA
-                 U+09AE/U+09CD/U+09AE: "ম্ম" BENGALI LETTER MA/BENGALI SIGN VIRAMA/BENGALI LETTER MA
-                 U+09AE/U+09CD/U+09B0: "ম্র" BENGALI LETTER MA/BENGALI SIGN VIRAMA/BENGALI LETTER RA
-                 U+09AE/U+09CD/U+09B2: "ম্ল" BENGALI LETTER MA/BENGALI SIGN VIRAMA/BENGALI LETTER LA -->
-            <Key
-                 latin:keySpec="&#x09AE;"
-                 latin:moreKeys=",&#x09AE;&#x09CD;&#x09A8;,&#x09AE;&#x09CD;&#x09AA;,&#x09AE;&#x09CD;&#x09AC;,&#x09AE;&#x09CD;&#x09AD;,&#x09AE;&#x09CD;&#x09AE;,&#x09AE;&#x09CD;&#x09B0;,&#x09AE;&#x09CD;&#x09B2;" />
-            <!-- U+098F: "এ" BENGALI LETTER E -->
-            <Key latin:keySpec="&#x098F;" />
-            <!-- U+0993: "ও" BENGALI LETTER O -->
-            <Key latin:keySpec="&#x0993;" />
-        </default>
-    </switch>
-</merge>
diff --git a/java/res/xml/rowkeys_bepo1.xml b/java/res/xml/rowkeys_bepo1.xml
deleted file mode 100644
index 295ca40f4..000000000
--- a/java/res/xml/rowkeys_bepo1.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2015 The CyanogenMod Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <Key
-        latin:keySpec="b"
-        latin:moreKeys="!text/number_1,!text/qwertysyms_q,!text/morekeys_b" />
-    <Key
-        latin:keySpec="&#xE9;"
-        latin:moreKeys="!text/number_2,!text/qwertysyms_w,&#xE8;" />
-    <Key
-        latin:keySpec="p"
-        latin:moreKeys="!text/number_3,!text/qwertysyms_e,!text/morekeys_p" />
-    <Key
-        latin:keySpec="o"
-        latin:moreKeys="!text/number_4,!text/qwertysyms_r,!text/morekeys_o" />
-    <Key
-        latin:keySpec="v"
-        latin:moreKeys="!text/number_5,!text/qwertysyms_t,!text/morekeys_v" />
-    <Key
-        latin:keySpec="d"
-        latin:moreKeys="!text/number_6,!text/qwertysyms_y,!text/morekeys_d" />
-    <Key
-        latin:keySpec="l"
-        latin:moreKeys="!text/number_7,!text/qwertysyms_u,!text/morekeys_l" />
-    <Key
-        latin:keySpec="j"
-        latin:moreKeys="!text/number_8,!text/qwertysyms_i,!text/morekeys_j" />
-    <Key
-        latin:keySpec="z"
-        latin:moreKeys="!text/number_9,!text/qwertysyms_o,!text/morekeys_z" />
-    <Key
-        latin:keySpec="w"
-        latin:moreKeys="!text/number_0,!text/qwertysyms_p,!text/morekeys_w" />
-</merge>
diff --git a/java/res/xml/rowkeys_bepo2.xml b/java/res/xml/rowkeys_bepo2.xml
deleted file mode 100644
index fed54b91f..000000000
--- a/java/res/xml/rowkeys_bepo2.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2015 The CyanogenMod Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <Key
-        latin:keySpec="a"
-        latin:moreKeys="!text/qwertysyms_a,!text/morekeys_a" />
-    <Key
-        latin:keySpec="u"
-        latin:moreKeys="!text/qwertysyms_s,!text/morekeys_u" />
-    <Key
-        latin:keySpec="i"
-        latin:moreKeys="!text/qwertysyms_d,!text/morekeys_i" />
-    <Key
-        latin:keySpec="e"
-        latin:moreKeys="!text/qwertysyms_f,!text/morekeys_e" />
-    <Key
-        latin:keySpec="c"
-        latin:moreKeys="!text/qwertysyms_g,!text/morekeys_c" />
-    <Key
-        latin:keySpec="t"
-        latin:moreKeys="!text/qwertysyms_h,!text/morekeys_t" />
-    <Key
-        latin:keySpec="s"
-        latin:moreKeys="!text/qwertysyms_j,!text/morekeys_s" />
-    <Key
-        latin:keySpec="r"
-        latin:moreKeys="!text/qwertysyms_k,!text/morekeys_r" />
-    <Key
-        latin:keySpec="n"
-        latin:moreKeys="!text/qwertysyms_l,!text/morekeys_n" />
-    <Key
-        latin:keySpec="m"
-        latin:moreKeys="!text/morekeys_c" />
-</merge>
diff --git a/java/res/xml/rowkeys_bepo3.xml b/java/res/xml/rowkeys_bepo3.xml
deleted file mode 100644
index 980f3eac0..000000000
--- a/java/res/xml/rowkeys_bepo3.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2015 The CyanogenMod Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <Key
-        latin:keySpec="y"
-        latin:moreKeys="!text/qwertysyms_z,!text/morekeys_y" />
-    <Key
-        latin:keySpec="x"
-        latin:moreKeys="!text/qwertysyms_x,!text/morekeys_x" />
-    <Key
-        latin:keySpec="k"
-        latin:moreKeys="!text/qwertysyms_c,!text/morekeys_k" />
-    <Key
-        latin:keySpec="q"
-        latin:moreKeys="!text/qwertysyms_v,!text/morekeys_q" />
-    <Key
-        latin:keySpec="g"
-        latin:moreKeys="!text/qwertysyms_b,!text/morekeys_g" /> />
-    <Key
-        latin:keySpec="h"
-        latin:moreKeys="!text/qwertysyms_n,!text/morekeys_h" />
-    <Key
-        latin:keySpec="f"
-        latin:moreKeys="!text/qwertysyms_m,!text/morekeys_f" />
-</merge>
diff --git a/java/res/xml/rowkeys_bulgarian1.xml b/java/res/xml/rowkeys_bulgarian1.xml
deleted file mode 100644
index 86e5d4777..000000000
--- a/java/res/xml/rowkeys_bulgarian1.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <!-- U+044F: "я" CYRILLIC SMALL LETTER YA -->
-    <Key
-        latin:keySpec="&#x044F;"
-        latin:keyHintLabel="1"
-        latin:additionalMoreKeys="1" />
-    <!-- U+0432: "в" CYRILLIC SMALL LETTER VE -->
-    <Key
-        latin:keySpec="&#x0432;"
-        latin:keyHintLabel="2"
-        latin:additionalMoreKeys="2" />
-    <!-- U+0435: "е" CYRILLIC SMALL LETTER IE -->
-    <Key
-        latin:keySpec="&#x0435;"
-        latin:keyHintLabel="3"
-        latin:additionalMoreKeys="3" />
-    <!-- U+0440: "р" CYRILLIC SMALL LETTER ER -->
-    <Key
-        latin:keySpec="&#x0440;"
-        latin:keyHintLabel="4"
-        latin:additionalMoreKeys="4" />
-    <!-- U+0442: "т" CYRILLIC SMALL LETTER TE -->
-    <Key
-        latin:keySpec="&#x0442;"
-        latin:keyHintLabel="5"
-        latin:additionalMoreKeys="5" />
-    <!-- U+044A: "ъ" CYRILLIC SMALL LETTER HARD SIGN -->
-    <Key
-        latin:keySpec="&#x044A;"
-        latin:keyHintLabel="6"
-        latin:additionalMoreKeys="6" />
-    <!-- U+0443: "у" CYRILLIC SMALL LETTER U -->
-    <Key
-        latin:keySpec="&#x0443;"
-        latin:keyHintLabel="7"
-        latin:additionalMoreKeys="7" />
-    <!-- U+0438: "и" CYRILLIC SMALL LETTER I
-         U+045D: "ѝ" CYRILLIC SMALL LETTER I WITH GRAVE -->
-    <Key
-        latin:keySpec="&#x0438;"
-        latin:keyHintLabel="8"
-        latin:additionalMoreKeys="8"
-        latin:moreKeys="&#x045D;" />
-    <!-- U+043E: "о" CYRILLIC SMALL LETTER O -->
-    <Key
-        latin:keySpec="&#x043E;"
-        latin:keyHintLabel="9"
-        latin:additionalMoreKeys="9" />
-    <!-- U+043F: "п" CYRILLIC SMALL LETTER PE -->
-    <Key
-        latin:keySpec="&#x043F;"
-        latin:keyHintLabel="0"
-        latin:additionalMoreKeys="0" />
-    <!-- U+0447: "ч" CYRILLIC SMALL LETTER CHE -->
-    <Key
-        latin:keySpec="&#x0447;" />
-</merge>
diff --git a/java/res/xml/rowkeys_bulgarian2.xml b/java/res/xml/rowkeys_bulgarian2.xml
deleted file mode 100644
index f48b4cdc9..000000000
--- a/java/res/xml/rowkeys_bulgarian2.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <!-- U+0430: "а" CYRILLIC SMALL LETTER A -->
-    <Key
-        latin:keySpec="&#x0430;" />
-    <!-- U+0441: "с" CYRILLIC SMALL LETTER ES -->
-    <Key
-        latin:keySpec="&#x0441;" />
-    <!-- U+0434: "д" CYRILLIC SMALL LETTER DE -->
-    <Key
-        latin:keySpec="&#x0434;" />
-    <!-- U+0444: "ф" CYRILLIC SMALL LETTER EF -->
-    <Key
-        latin:keySpec="&#x0444;" />
-    <!-- U+0433: "г" CYRILLIC SMALL LETTER GHE -->
-    <Key
-        latin:keySpec="&#x0433;" />
-    <!-- U+0445: "х" CYRILLIC SMALL LETTER HA -->
-    <Key
-        latin:keySpec="&#x0445;" />
-    <!-- U+0439: "й" CYRILLIC SMALL LETTER SHORT I -->
-    <Key
-        latin:keySpec="&#x0439;" />
-    <!-- U+043A: "к" CYRILLIC SMALL LETTER KA -->
-    <Key
-        latin:keySpec="&#x043A;" />
-    <!-- U+043B: "л" CYRILLIC SMALL LETTER EL -->
-    <Key
-        latin:keySpec="&#x043B;" />
-    <!-- U+0448: "ш" CYRILLIC SMALL LETTER SHA -->
-    <Key
-        latin:keySpec="&#x0448;" />
-    <!-- U+0449: "щ" CYRILLIC SMALL LETTER SHCHA -->
-    <Key
-        latin:keySpec="&#x0449;" />
-</merge>
diff --git a/java/res/xml/rowkeys_bulgarian3.xml b/java/res/xml/rowkeys_bulgarian3.xml
deleted file mode 100644
index c14aabdcd..000000000
--- a/java/res/xml/rowkeys_bulgarian3.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <!-- U+0437: "з" CYRILLIC SMALL LETTER ZE -->
-    <Key
-        latin:keySpec="&#x0437;" />
-    <!-- U+044C: "ь" CYRILLIC SMALL LETTER SOFT SIGN -->
-    <Key
-        latin:keySpec="&#x044C;" />
-    <!-- U+0446: "ц" CYRILLIC SMALL LETTER TSE -->
-    <Key
-        latin:keySpec="&#x0446;" />
-    <!-- U+0436: "ж" CYRILLIC SMALL LETTER ZHE -->
-    <Key
-        latin:keySpec="&#x0436;" />
-    <!-- U+0431: "б" CYRILLIC SMALL LETTER BE -->
-    <Key
-        latin:keySpec="&#x0431;" />
-    <!-- U+043D: "н" CYRILLIC SMALL LETTER EN -->
-    <Key
-        latin:keySpec="&#x043D;" />
-    <!-- U+043C: "м" CYRILLIC SMALL LETTER EM -->
-    <Key
-        latin:keySpec="&#x043C;" />
-    <!-- U+044E: "ю" CYRILLIC SMALL LETTER YU -->
-    <Key
-        latin:keySpec="&#x044E;" />
-</merge>
diff --git a/java/res/xml/rowkeys_bulgarian_bds1.xml b/java/res/xml/rowkeys_bulgarian_bds1.xml
deleted file mode 100644
index 70fa2b271..000000000
--- a/java/res/xml/rowkeys_bulgarian_bds1.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <!-- U+0443: "у" CYRILLIC SMALL LETTER U -->
-    <Key
-        latin:keySpec="&#x0443;"
-        latin:keyHintLabel="1"
-        latin:additionalMoreKeys="1" />
-    <!-- U+0435: "е" CYRILLIC SMALL LETTER IE -->
-    <Key
-        latin:keySpec="&#x0435;"
-        latin:keyHintLabel="2"
-        latin:additionalMoreKeys="2" />
-    <!-- U+0438: "и" CYRILLIC SMALL LETTER I
-         U+045D: "ѝ" CYRILLIC SMALL LETTER I WITH GRAVE -->
-    <Key
-        latin:keySpec="&#x0438;"
-        latin:keyHintLabel="3"
-        latin:additionalMoreKeys="3"
-        latin:moreKeys="&#x045D;" />
-    <!-- U+0448: "ш" CYRILLIC SMALL LETTER SHA -->
-    <Key
-        latin:keySpec="&#x0448;"
-        latin:keyHintLabel="4"
-        latin:additionalMoreKeys="4" />
-    <!-- U+0449: "щ" CYRILLIC SMALL LETTER SHCHA -->
-    <Key
-        latin:keySpec="&#x0449;"
-        latin:keyHintLabel="5"
-        latin:additionalMoreKeys="5" />
-    <!-- U+043A: "к" CYRILLIC SMALL LETTER KA -->
-    <Key
-        latin:keySpec="&#x043A;"
-        latin:keyHintLabel="6"
-        latin:additionalMoreKeys="6" />
-    <!-- U+0441: "с" CYRILLIC SMALL LETTER ES -->
-    <Key
-        latin:keySpec="&#x0441;"
-        latin:keyHintLabel="7"
-        latin:additionalMoreKeys="7" />
-    <!-- U+0434: "д" CYRILLIC SMALL LETTER DE -->
-    <Key
-        latin:keySpec="&#x0434;"
-        latin:keyHintLabel="8"
-        latin:additionalMoreKeys="8" />
-    <!-- U+0437: "з" CYRILLIC SMALL LETTER ZE -->
-    <Key
-        latin:keySpec="&#x0437;"
-        latin:keyHintLabel="9"
-        latin:additionalMoreKeys="9" />
-    <!-- U+0446: "ц" CYRILLIC SMALL LETTER TSE -->
-    <Key
-        latin:keySpec="&#x0446;"
-        latin:keyHintLabel="0"
-        latin:additionalMoreKeys="0" />
-    <!-- U+0431: "б" CYRILLIC SMALL LETTER BE -->
-    <Key
-        latin:keySpec="&#x0431;" />
-</merge>
diff --git a/java/res/xml/rowkeys_bulgarian_bds2.xml b/java/res/xml/rowkeys_bulgarian_bds2.xml
deleted file mode 100644
index e61ee5919..000000000
--- a/java/res/xml/rowkeys_bulgarian_bds2.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <!-- U+044C: "ь" CYRILLIC SMALL LETTER SOFT SIGN -->
-    <Key
-        latin:keySpec="&#x044C;" />
-    <!-- U+044F: "я" CYRILLIC SMALL LETTER YA -->
-    <Key
-        latin:keySpec="&#x044F;" />
-    <!-- U+0430: "а" CYRILLIC SMALL LETTER A -->
-    <Key
-        latin:keySpec="&#x0430;" />
-    <!-- U+043E: "о" CYRILLIC SMALL LETTER O -->
-    <Key
-        latin:keySpec="&#x043E;" />
-    <!-- U+0436: "ж" CYRILLIC SMALL LETTER ZHE -->
-    <Key
-        latin:keySpec="&#x0436;" />
-    <!-- U+0433: "г" CYRILLIC SMALL LETTER GHE -->
-    <Key
-        latin:keySpec="&#x0433;" />
-    <!-- U+0442: "т" CYRILLIC SMALL LETTER TE -->
-    <Key
-        latin:keySpec="&#x0442;" />
-    <!-- U+043D: "н" CYRILLIC SMALL LETTER EN -->
-    <Key
-        latin:keySpec="&#x043D;" />
-    <!-- U+0432: "в" CYRILLIC SMALL LETTER VE -->
-    <Key
-        latin:keySpec="&#x0432;" />
-    <!-- U+043C: "м" CYRILLIC SMALL LETTER EM -->
-    <Key
-        latin:keySpec="&#x043C;" />
-    <!-- U+0447: "ч" CYRILLIC SMALL LETTER CHE -->
-    <Key
-        latin:keySpec="&#x0447;" />
-</merge>
diff --git a/java/res/xml/rowkeys_bulgarian_bds3.xml b/java/res/xml/rowkeys_bulgarian_bds3.xml
deleted file mode 100644
index 82f0bfe95..000000000
--- a/java/res/xml/rowkeys_bulgarian_bds3.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <!-- U+044E: "ю" CYRILLIC SMALL LETTER YU -->
-    <Key
-        latin:keySpec="&#x044E;" />
-    <!-- U+0439: "й" CYRILLIC SMALL LETTER SHORT I -->
-    <Key
-        latin:keySpec="&#x0439;" />
-    <!-- U+044A: "ъ" CYRILLIC SMALL LETTER HARD SIGN -->
-    <Key
-        latin:keySpec="&#x044A;" />
-    <!-- U+044D: "э" CYRILLIC SMALL LETTER E -->
-    <Key
-        latin:keySpec="&#x044D;" />
-    <!-- U+0444: "ф" CYRILLIC SMALL LETTER EF -->
-    <Key
-        latin:keySpec="&#x0444;" />
-    <!-- U+0445: "х" CYRILLIC SMALL LETTER HA -->
-    <Key
-        latin:keySpec="&#x0445;" />
-    <!-- U+043F: "п" CYRILLIC SMALL LETTER PE -->
-    <Key
-        latin:keySpec="&#x043F;" />
-    <!-- U+0440: "р" CYRILLIC SMALL LETTER ER -->
-    <Key
-        latin:keySpec="&#x0440;" />
-    <!-- U+043B: "л" CYRILLIC SMALL LETTER EL -->
-    <Key
-        latin:keySpec="&#x043B;" />
-</merge>
diff --git a/java/res/xml/rowkeys_colemak1.xml b/java/res/xml/rowkeys_colemak1.xml
deleted file mode 100644
index 47adf8dd8..000000000
--- a/java/res/xml/rowkeys_colemak1.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <Key
-        latin:keySpec="!text/keyspec_q"
-        latin:moreKeys="!text/number_1,!text/qwertysyms_q,!text/morekeys_q" />
-    <Key
-        latin:keySpec="!text/keyspec_w"
-        latin:moreKeys="!text/number_2,!text/qwertysyms_w,!text/morekeys_w" />
-    <Key
-        latin:keySpec="f"
-        latin:moreKeys="!text/number_3,!text/qwertysyms_e,!text/morekeys_f" />
-    <Key
-        latin:keySpec="p"
-        latin:moreKeys="!text/number_4,!text/qwertysyms_r,!text/morekeys_p" />
-    <Key
-        latin:keySpec="g"
-        latin:moreKeys="!text/number_5,!text/qwertysyms_t,!text/morekeys_g" />
-    <Key
-        latin:keySpec="j"
-        latin:moreKeys="!text/number_6,!text/qwertysyms_y,!text/morekeys_j" />
-    <Key
-        latin:keySpec="l"
-        latin:moreKeys="!text/number_7,!text/qwertysyms_u,!text/morekeys_l" />
-    <Key
-        latin:keySpec="u"
-        latin:moreKeys="!text/number_8,!text/qwertysyms_i,!text/morekeys_u" />
-    <Key
-        latin:keySpec="y"
-        latin:moreKeys="!text/number_9,!text/qwertysyms_o,!text/morekeys_y" />
-    <switch>
-        <case
-            latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLockShifted"
-        >
-            <Key
-                latin:keySpec=":"
-                latin:moreKeys="!text/number_0,!text/qwertysyms_p" />
-        </case>
-        <default>
-            <Key
-                latin:keySpec=";"
-                latin:moreKeys="!text/number_0,!text/qwertysyms_p" />
-        </default>
-    </switch>
-</merge>
diff --git a/java/res/xml/rowkeys_colemak2.xml b/java/res/xml/rowkeys_colemak2.xml
deleted file mode 100644
index 848770e71..000000000
--- a/java/res/xml/rowkeys_colemak2.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <Key
-        latin:keySpec="a"
-        latin:moreKeys="!text/qwertysyms_a,!text/morekeys_a" />
-    <Key
-        latin:keySpec="r"
-        latin:moreKeys="!text/qwertysyms_s,!text/morekeys_r" />
-    <Key
-        latin:keySpec="s"
-        latin:moreKeys="!text/qwertysyms_d,!text/morekeys_s" />
-    <Key
-        latin:keySpec="t"
-        latin:moreKeys="!text/qwertysyms_f,!text/morekeys_t" />
-    <Key
-        latin:keySpec="d"
-        latin:moreKeys="!text/qwertysyms_g,!text/morekeys_d" />
-    <Key
-        latin:keySpec="h"
-        latin:moreKeys="!text/qwertysyms_h,!text/morekeys_h" />
-    <Key
-        latin:keySpec="n"
-        latin:moreKeys="!text/qwertysyms_j,!text/morekeys_n" />
-    <Key
-        latin:keySpec="e"
-        latin:moreKeys="!text/qwertysyms_k,!text/morekeys_e" />
-    <Key
-        latin:keySpec="i"
-        latin:moreKeys="!text/qwertysyms_l,!text/morekeys_i" />
-    <Key
-        latin:keySpec="o"
-        latin:moreKeys="!text/morekeys_o" />
-</merge>
diff --git a/java/res/xml/rowkeys_colemak3.xml b/java/res/xml/rowkeys_colemak3.xml
deleted file mode 100644
index ba722574b..000000000
--- a/java/res/xml/rowkeys_colemak3.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <Key
-        latin:keySpec="z"
-        latin:moreKeys="!text/qwertysyms_z,!text/morekeys_z" />
-    <Key
-        latin:keySpec="x"
-        latin:moreKeys="!text/qwertysyms_x,!text/morekeys_x" />
-    <Key
-        latin:keySpec="c"
-        latin:moreKeys="!text/qwertysyms_c,!text/morekeys_c" />
-    <Key
-        latin:keySpec="v"
-        latin:moreKeys="!text/qwertysyms_v,!text/morekeys_v" />
-    <Key
-        latin:keySpec="b"
-        latin:moreKeys="!text/qwertysyms_b,!text/morekeys_b" />
-    <Key
-        latin:keySpec="k"
-        latin:moreKeys="!text/qwertysyms_n,!text/morekeys_k" />
-    <Key
-        latin:keySpec="m"
-        latin:moreKeys="!text/qwertysyms_m,!text/morekeys_n" />
-</merge>
diff --git a/java/res/xml/rowkeys_dvorak1.xml b/java/res/xml/rowkeys_dvorak1.xml
deleted file mode 100644
index b1ad37a11..000000000
--- a/java/res/xml/rowkeys_dvorak1.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <include
-        latin:keyboardLayout="@xml/keys_dvorak_123" />
-    <Key
-        latin:keySpec="p"
-        latin:moreKeys="!text/morekeys_p,!text/qwertysyms_r,!text/number_4" />
-    <Key
-        latin:keySpec="y"
-        latin:moreKeys="!text/morekeys_y,!text/qwertysyms_t,!text/number_5" />
-    <Key
-        latin:keySpec="f"
-        latin:moreKeys="!text/morekeys_f,!text/qwertysyms_y,!text/number_6" />
-    <Key
-        latin:keySpec="g"
-        latin:moreKeys="!text/morekeys_g,!text/qwertysyms_u,!text/number_7" />
-    <Key
-        latin:keySpec="c"
-        latin:moreKeys="!text/morekeys_c,!text/qwertysyms_i,!text/number_8" />
-    <Key
-        latin:keySpec="r"
-        latin:moreKeys="!text/morekeys_r,!text/qwertysyms_o,!text/number_9" />
-    <Key
-        latin:keySpec="l"
-        latin:moreKeys="!text/morekeys_l,!text/qwertysyms_p,!text/number_0" />
-</merge>
diff --git a/java/res/xml/rowkeys_dvorak2.xml b/java/res/xml/rowkeys_dvorak2.xml
deleted file mode 100644
index f98744d63..000000000
--- a/java/res/xml/rowkeys_dvorak2.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <Key
-        latin:keySpec="a"
-        latin:moreKeys="!text/morekeys_a,!text/qwertysyms_a" />
-    <Key
-        latin:keySpec="o"
-        latin:moreKeys="!text/morekeys_o,!text/qwertysyms_s" />
-    <Key
-        latin:keySpec="e"
-        latin:moreKeys="!text/morekeys_e,!text/qwertysyms_d" />
-    <Key
-        latin:keySpec="u"
-        latin:moreKeys="!text/morekeys_u,!text/qwertysyms_f" />
-    <Key
-        latin:keySpec="i"
-        latin:moreKeys="!text/morekeys_i,!text/qwertysyms_g" />
-    <Key
-        latin:keySpec="d"
-        latin:moreKeys="!text/morekeys_d,!text/qwertysyms_h" />
-    <Key
-        latin:keySpec="h"
-        latin:moreKeys="!text/morekeys_h,!text/qwertysyms_j" />
-    <Key
-        latin:keySpec="t"
-        latin:moreKeys="!text/morekeys_t,!text/qwertysyms_k" />
-    <Key
-        latin:keySpec="n"
-        latin:moreKeys="!text/morekeys_n,!text/qwertysyms_l" />
-    <Key
-        latin:keySpec="s"
-        latin:moreKeys="!text/morekeys_s" />
-</merge>
diff --git a/java/res/xml/rowkeys_dvorak3.xml b/java/res/xml/rowkeys_dvorak3.xml
deleted file mode 100644
index f728a9f08..000000000
--- a/java/res/xml/rowkeys_dvorak3.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <Key
-        latin:keySpec="j"
-        latin:moreKeys="!text/morekeys_j,!text/qwertysyms_z" />
-    <Key
-        latin:keySpec="k"
-        latin:moreKeys="!text/morekeys_k,!text/qwertysyms_x" />
-    <Key
-        latin:keySpec="x"
-        latin:moreKeys="!text/morekeys_x,!text/qwertysyms_c" />
-    <Key
-        latin:keySpec="b"
-        latin:moreKeys="!text/morekeys_b,!text/qwertysyms_v" />
-    <Key
-        latin:keySpec="m"
-        latin:moreKeys="!text/morekeys_m,!text/qwertysyms_b" />
-    <Key
-        latin:keySpec="w"
-        latin:moreKeys="!text/morekeys_w,!text/qwertysyms_n" />
-    <Key
-        latin:keySpec="v"
-        latin:moreKeys="!text/morekeys_v,!text/qwertysyms_m" />
-</merge>
diff --git a/java/res/xml/rowkeys_east_slavic1.xml b/java/res/xml/rowkeys_east_slavic1.xml
deleted file mode 100644
index 4147a88a8..000000000
--- a/java/res/xml/rowkeys_east_slavic1.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <!-- U+0439: "й" CYRILLIC SMALL LETTER SHORT I -->
-    <Key
-        latin:keySpec="&#x0439;"
-        latin:keyHintLabel="1"
-        latin:additionalMoreKeys="1" />
-    <!-- U+0446: "ц" CYRILLIC SMALL LETTER TSE -->
-    <Key
-        latin:keySpec="&#x0446;"
-        latin:keyHintLabel="2"
-        latin:additionalMoreKeys="2" />
-    <!-- U+0443: "у" CYRILLIC SMALL LETTER U -->
-    <Key
-        latin:keySpec="&#x0443;"
-        latin:keyHintLabel="3"
-        latin:additionalMoreKeys="3"
-        latin:moreKeys="!text/morekeys_cyrillic_u" />
-    <!-- U+043A: "к" CYRILLIC SMALL LETTER KA -->
-    <Key
-        latin:keySpec="&#x043A;"
-        latin:keyHintLabel="4"
-        latin:additionalMoreKeys="4"
-        latin:moreKeys="!text/morekeys_cyrillic_ka" />
-    <!-- U+0435: "е" CYRILLIC SMALL LETTER IE -->
-    <Key
-        latin:keySpec="&#x0435;"
-        latin:keyHintLabel="5"
-        latin:additionalMoreKeys="5"
-        latin:moreKeys="!text/morekeys_cyrillic_ie" />
-    <!-- U+043D: "н" CYRILLIC SMALL LETTER EN -->
-    <Key
-        latin:keySpec="&#x043D;"
-        latin:keyHintLabel="6"
-        latin:additionalMoreKeys="6"
-        latin:moreKeys="!text/morekeys_cyrillic_en" />
-    <!-- U+0433: "г" CYRILLIC SMALL LETTER GHE -->
-    <Key
-        latin:keySpec="&#x0433;"
-        latin:keyHintLabel="7"
-        latin:additionalMoreKeys="7"
-        latin:moreKeys="!text/morekeys_cyrillic_ghe" />
-    <!-- U+0448: "ш" CYRILLIC SMALL LETTER SHA -->
-    <Key
-        latin:keySpec="&#x0448;"
-        latin:keyHintLabel="8"
-        latin:additionalMoreKeys="8" />
-    <Key
-        latin:keySpec="!text/keyspec_east_slavic_row1_9"
-        latin:keyHintLabel="9"
-        latin:additionalMoreKeys="9" />
-    <!-- U+0437: "з" CYRILLIC SMALL LETTER ZE -->
-    <Key
-        latin:keySpec="&#x0437;"
-        latin:keyHintLabel="0"
-        latin:additionalMoreKeys="0" />
-    <!-- U+0445: "х" CYRILLIC SMALL LETTER HA -->
-    <Key
-        latin:keySpec="&#x0445;" />
-</merge>
diff --git a/java/res/xml/rowkeys_east_slavic2.xml b/java/res/xml/rowkeys_east_slavic2.xml
deleted file mode 100644
index 5c663a22c..000000000
--- a/java/res/xml/rowkeys_east_slavic2.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <!-- U+0444: "ф" CYRILLIC SMALL LETTER EF -->
-    <Key
-        latin:keySpec="&#x0444;" />
-    <Key
-        latin:keySpec="!text/keyspec_east_slavic_row2_2"
-        latin:moreKeys="!text/morekeys_east_slavic_row2_2" />
-    <!-- U+0432: "в" CYRILLIC SMALL LETTER VE -->
-    <Key
-        latin:keySpec="&#x0432;" />
-    <!-- U+0430: "а" CYRILLIC SMALL LETTER A -->
-    <Key
-        latin:keySpec="&#x0430;"
-        latin:moreKeys="!text/morekeys_cyrillic_a" />
-    <!-- U+043F: "п" CYRILLIC SMALL LETTER PE -->
-    <Key
-        latin:keySpec="&#x043F;" />
-    <!-- U+0440: "р" CYRILLIC SMALL LETTER ER -->
-    <Key
-        latin:keySpec="&#x0440;" />
-    <!-- U+043E: "о" CYRILLIC SMALL LETTER O -->
-    <Key
-        latin:keySpec="&#x043E;"
-        latin:moreKeys="!text/morekeys_cyrillic_o" />
-    <!-- U+043B: "л" CYRILLIC SMALL LETTER EL -->
-    <Key
-        latin:keySpec="&#x043B;" />
-    <!-- U+0434: "д" CYRILLIC SMALL LETTER DE -->
-    <Key
-        latin:keySpec="&#x0434;" />
-    <!-- U+0436: "ж" CYRILLIC SMALL LETTER ZHE -->
-    <Key
-        latin:keySpec="&#x0436;" />
-    <Key
-        latin:keySpec="!text/keyspec_east_slavic_row2_11"
-        latin:moreKeys="!text/morekeys_east_slavic_row2_11" />
-</merge>
diff --git a/java/res/xml/rowkeys_east_slavic3.xml b/java/res/xml/rowkeys_east_slavic3.xml
deleted file mode 100644
index e487ef146..000000000
--- a/java/res/xml/rowkeys_east_slavic3.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <!-- U+044F: "я" CYRILLIC SMALL LETTER YA -->
-    <Key
-        latin:keySpec="&#x044F;" />
-    <!-- U+0447: "ч" CYRILLIC SMALL LETTER CHE -->
-    <Key
-        latin:keySpec="&#x0447;" />
-    <!-- U+0441: "с" CYRILLIC SMALL LETTER ES -->
-    <Key
-        latin:keySpec="&#x0441;" />
-    <!-- U+043C: "м" CYRILLIC SMALL LETTER EM -->
-    <Key
-        latin:keySpec="&#x043C;" />
-    <Key
-        latin:keySpec="!text/keyspec_east_slavic_row3_5" />
-    <!-- U+0442: "т" CYRILLIC SMALL LETTER TE -->
-    <Key
-        latin:keySpec="&#x0442;" />
-    <!-- U+044C: "ь" CYRILLIC SMALL LETTER SOFT SIGN -->
-    <Key
-        latin:keySpec="&#x044C;"
-        latin:moreKeys="!text/morekeys_cyrillic_soft_sign" />
-    <!-- U+0431: "б" CYRILLIC SMALL LETTER BE -->
-    <Key
-        latin:keySpec="&#x0431;" />
-    <!-- U+044E: "ю" CYRILLIC SMALL LETTER YU -->
-    <Key
-        latin:keySpec="&#x044E;" />
-</merge>
diff --git a/java/res/xml/rowkeys_east_slavic_phonetic1.xml b/java/res/xml/rowkeys_east_slavic_phonetic1.xml
deleted file mode 100644
index af7a37884..000000000
--- a/java/res/xml/rowkeys_east_slavic_phonetic1.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <Key
-        latin:keySpec="я"
-        latin:additionalMoreKeys="1" />
-    <Key
-        latin:keySpec="ш"
-        latin:additionalMoreKeys="ч,щ,2" />
-    <Key
-        latin:keySpec="е"
-        latin:additionalMoreKeys="э,ё,3" />
-    <Key
-        latin:keySpec="р"
-        latin:keyHintLabel="4"
-        latin:additionalMoreKeys="4" />
-    <Key
-        latin:keySpec="т"
-        latin:keyHintLabel="5"
-        latin:additionalMoreKeys="5" />
-    <Key
-        latin:keySpec="!text/keyspec_east_slavic_row2_2"
-        latin:moreKeys="!text/morekeys_east_slavic_row2_2"
-        latin:keyHintLabel="6"
-        latin:additionalMoreKeys="6" />
-    <Key
-        latin:keySpec="у"
-        latin:additionalMoreKeys="ю,7" />
-    <Key
-        latin:keySpec="и"
-        latin:keyHintLabel="8"
-        latin:additionalMoreKeys="8" />
-    <Key
-        latin:keySpec="о"
-        latin:keyHintLabel="9"
-        latin:additionalMoreKeys="9" />
-    <Key
-        latin:keySpec="п"
-        latin:keyHintLabel="0"
-        latin:additionalMoreKeys="0" />
-</merge>
diff --git a/java/res/xml/rowkeys_east_slavic_phonetic2.xml b/java/res/xml/rowkeys_east_slavic_phonetic2.xml
deleted file mode 100644
index f2ddc45b0..000000000
--- a/java/res/xml/rowkeys_east_slavic_phonetic2.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <Key
-        latin:keySpec="а" />
-    <Key
-        latin:keySpec="с" />
-    <Key
-        latin:keySpec="д" />
-    <Key
-        latin:keySpec="ф" />
-    <Key
-        latin:keySpec="г" />
-    <Key
-        latin:keySpec="х" />
-    <Key
-        latin:keySpec="й" />
-    <Key
-        latin:keySpec="к" />
-    <Key
-        latin:keySpec="л" />
-</merge>
diff --git a/java/res/xml/rowkeys_east_slavic_phonetic3.xml b/java/res/xml/rowkeys_east_slavic_phonetic3.xml
deleted file mode 100644
index f25a22637..000000000
--- a/java/res/xml/rowkeys_east_slavic_phonetic3.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <Key
-        latin:keySpec="з"
-        latin:additionalMoreKeys="ж" />
-    <Key
-        latin:keySpec="ь"
-        latin:additionalMoreKeys="ъ" />
-    <Key
-        latin:keySpec="ц" />
-    <Key
-        latin:keySpec="в" />
-    <Key
-        latin:keySpec="б" />
-    <Key
-        latin:keySpec="н" />
-    <Key
-        latin:keySpec="м" />
-</merge>
diff --git a/java/res/xml/rowkeys_farsi1.xml b/java/res/xml/rowkeys_farsi1.xml
deleted file mode 100644
index 363c28e28..000000000
--- a/java/res/xml/rowkeys_farsi1.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <!-- U+0636: "ض" ARABIC LETTER DAD
-         U+06F1: "۱" EXTENDED ARABIC-INDIC DIGIT ONE -->
-    <Key
-        latin:keySpec="&#x0636;"
-        latin:keyHintLabel="&#x06F1;"
-        latin:additionalMoreKeys="&#x06F1;,1" />
-    <!-- U+0635: "ص" ARABIC LETTER SAD
-         U+06F2: "۲" EXTENDED ARABIC-INDIC DIGIT TWO -->
-    <Key
-        latin:keySpec="&#x0635;"
-        latin:keyHintLabel="&#x06F2;"
-        latin:additionalMoreKeys="&#x06F2;,2" />
-    <!-- U+062B: "ث" ARABIC LETTER THEH
-         U+06F3: "۳" EXTENDED ARABIC-INDIC DIGIT THREE -->
-    <Key
-        latin:keySpec="&#x062B;"
-        latin:keyHintLabel="&#x06F3;"
-        latin:additionalMoreKeys="&#x06F3;,3" />
-    <!-- U+0642: "ق" ARABIC LETTER QAF
-         U+06F4: "۴" EXTENDED ARABIC-INDIC DIGIT FOUR -->
-    <Key
-        latin:keySpec="&#x0642;"
-        latin:keyHintLabel="&#x06F4;"
-        latin:additionalMoreKeys="&#x06F4;,4" />
-    <!-- U+0641: "ف" ARABIC LETTER FEH
-         U+06F5: "۵" EXTENDED ARABIC-INDIC DIGIT FIVE -->
-    <Key
-        latin:keySpec="&#x0641;"
-        latin:keyHintLabel="&#x06F5;"
-        latin:additionalMoreKeys="&#x06F5;,5" />
-    <!-- U+063A: "غ" ARABIC LETTER GHAIN
-         U+06F6: "۶" EXTENDED ARABIC-INDIC DIGIT SIX -->
-    <Key
-        latin:keySpec="&#x063A;"
-        latin:keyHintLabel="&#x06F6;"
-        latin:additionalMoreKeys="&#x06F6;,6" />
-    <!-- U+0639: "ع" ARABIC LETTER AIN
-         U+06F7: "۷" EXTENDED ARABIC-INDIC DIGIT SEVEN -->
-    <Key
-        latin:keySpec="&#x0639;"
-        latin:keyHintLabel="&#x06F7;"
-        latin:additionalMoreKeys="&#x06F7;,7" />
-    <!-- U+0647: "ه" ARABIC LETTER HEH
-         U+FEEB: "ﻫ" ARABIC LETTER HEH INITIAL FORM
-         U+0647/U+200D: ARABIC LETTER HEH + ZERO WIDTH JOINER
-         U+0647/U+0654: ARABIC LETTER HEH + ARABIC HAMZA ABOVE
-         U+0629: "ة" ARABIC LETTER TEH MARBUTA
-         U+06F8: "۸" EXTENDED ARABIC-INDIC DIGIT EIGHT -->
-    <Key
-        latin:keySpec="&#x0647;"
-        latin:moreKeys="&#xFEEB;|&#x0647;&#x200D;,&#x0647;&#x0654;,&#x0629;,%"
-        latin:keyHintLabel="&#x06F8;"
-        latin:additionalMoreKeys="&#x06F8;,8" />
-    <!-- U+062E: "خ" ARABIC LETTER KHAH
-         U+06F9: "۹" EXTENDED ARABIC-INDIC DIGIT NINE -->
-    <Key
-        latin:keySpec="&#x062E;"
-        latin:keyHintLabel="&#x06F9;"
-        latin:additionalMoreKeys="&#x06F9;,9" />
-    <!-- U+062D: "ح" ARABIC LETTER HAH
-         U+06F0: "۰" EXTENDED ARABIC-INDIC DIGIT ZERO -->
-    <Key
-        latin:keySpec="&#x062D;"
-        latin:keyHintLabel="&#x06F0;"
-        latin:additionalMoreKeys="&#x06F0;,0" />
-    <!-- U+062C: "ج" ARABIC LETTER JEEM -->
-    <Key latin:keySpec="&#x062C;" />
-</merge>
diff --git a/java/res/xml/rowkeys_farsi2.xml b/java/res/xml/rowkeys_farsi2.xml
deleted file mode 100644
index bec654d54..000000000
--- a/java/res/xml/rowkeys_farsi2.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <!-- U+0634: "ش" ARABIC LETTER SHEEN -->
-    <Key latin:keySpec="&#x0634;" />
-    <!-- U+0633: "س" ARABIC LETTER SEEN -->
-    <Key latin:keySpec="&#x0633;" />
-    <!-- U+06CC: "ی" ARABIC LETTER FARSI YEH
-         U+0626: "ئ" ARABIC LETTER YEH WITH HAMZA ABOVE
-         U+064A: "ي" ARABIC LETTER YEH
-         U+FBE8: "ﯨ" ARABIC LETTER UIGHUR KAZAKH KIRGHIZ ALEF MAKSURA INITIAL FORM
-         U+0649: "ى" ARABIC LETTER ALEF MAKSURA -->
-    <Key
-        latin:keySpec="&#x06CC;"
-        latin:moreKeys="&#x0626;,&#x064A;,&#xFBE8;|&#x0649;" />
-    <!-- U+0628: "ب" ARABIC LETTER BEH -->
-    <Key latin:keySpec="&#x0628;" />
-    <!-- U+0644: "ل" ARABIC LETTER LAM -->
-    <Key latin:keySpec="&#x0644;" />
-    <!-- U+0627: "ا" ARABIC LETTER ALEF
-         U+0671: "ٱ" ARABIC LETTER ALEF WASLA
-         U+0621: "ء" ARABIC LETTER HAMZA
-         U+0622: "آ" ARABIC LETTER ALEF WITH MADDA ABOVE
-         U+0623: "أ" ARABIC LETTER ALEF WITH HAMZA ABOVE
-         U+0625: "إ" ARABIC LETTER ALEF WITH HAMZA BELOW -->
-    <Key
-        latin:keySpec="&#x0627;"
-        latin:moreKeys="!fixedColumnOrder!5,&#x0671;,&#x0621;,&#x0622;,&#x0623;,&#x0625;" />
-    <!-- U+062A: "ت" ARABIC LETTER TEH
-         U+0629: "ة": ARABIC LETTER TEH MARBUTA -->
-    <Key
-        latin:keySpec="&#x062A;"
-        latin:moreKeys="&#x0629;" />
-    <!-- U+0646: "ن" ARABIC LETTER NOON -->
-    <Key latin:keySpec="&#x0646;" />
-    <!-- U+0645: "م" ARABIC LETTER MEEM -->
-    <Key latin:keySpec="&#x0645;" />
-    <!-- U+06A9: "ک" ARABIC LETTER KEHEH
-         U+0643: "ك" ARABIC LETTER KAF -->
-    <Key
-        latin:keySpec="&#x06A9;"
-        latin:moreKeys="&#x0643;" />
-    <!-- U+06AF: "گ" ARABIC LETTER GAF -->
-    <Key latin:keySpec="&#x06AF;" />
-</merge>
diff --git a/java/res/xml/rowkeys_farsi3.xml b/java/res/xml/rowkeys_farsi3.xml
deleted file mode 100644
index e82a1d5df..000000000
--- a/java/res/xml/rowkeys_farsi3.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <!-- U+0638: "ظ" ARABIC LETTER ZAH -->
-    <Key latin:keySpec="&#x0638;" />
-    <!-- U+0637: "ط" ARABIC LETTER TAH -->
-    <Key latin:keySpec="&#x0637;" />
-    <!-- U+0698: "ژ" ARABIC LETTER JEH -->
-    <Key latin:keySpec="&#x0698;" />
-    <!-- U+0632: "ز" ARABIC LETTER ZAIN -->
-    <Key latin:keySpec="&#x0632;" />
-    <!-- U+0631: "ر" ARABIC LETTER REH -->
-    <Key latin:keySpec="&#x0631;" />
-    <!-- U+0630: "ذ" ARABIC LETTER THAL -->
-    <Key latin:keySpec="&#x0630;" />
-    <!-- U+062F: "د" ARABIC LETTER DAL -->
-    <Key latin:keySpec="&#x062F;" />
-    <!-- U+067E: "پ" ARABIC LETTER PEH -->
-    <Key latin:keySpec="&#x067E;" />
-    <!-- U+0648: "و" ARABIC LETTER WAW
-         U+0624: "ؤ" ARABIC LETTER WAW WITH HAMZA ABOVE -->
-    <Key
-        latin:keySpec="&#x0648;"
-        latin:moreKeys="&#x0624;" />
-    <include latin:keyboardLayout="@xml/keys_farsi3_right" />
-</merge>
diff --git a/java/res/xml/rowkeys_georgian1.xml b/java/res/xml/rowkeys_georgian1.xml
deleted file mode 100644
index 4bdf3488b..000000000
--- a/java/res/xml/rowkeys_georgian1.xml
+++ /dev/null
@@ -1,131 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <switch>
-        <case
-            latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
-        >
-            <Key
-                latin:keySpec="Q"
-                latin:keyHintLabel="1"
-                latin:additionalMoreKeys="1" />
-            <!-- U+10ED: "ჭ" GEORGIAN LETTER CHAR -->
-            <Key
-                latin:keySpec="&#x10ED;"
-                latin:keyHintLabel="2"
-                latin:additionalMoreKeys="2" />
-            <Key
-                latin:keySpec="E"
-                latin:keyHintLabel="3"
-                latin:additionalMoreKeys="3" />
-            <!-- U+10E6: "ღ" GEORGIAN LETTER GHAN -->
-            <Key
-                latin:keySpec="&#x10E6;"
-                latin:keyHintLabel="4"
-                latin:additionalMoreKeys="4" />
-            <!-- U+10D7: "თ" GEORGIAN LETTER TAN -->
-            <Key
-                latin:keySpec="&#x10D7;"
-                latin:keyHintLabel="5"
-                latin:additionalMoreKeys="5" />
-            <Key
-                latin:keySpec="Y"
-                latin:keyHintLabel="6"
-                latin:additionalMoreKeys="6" />
-            <Key
-                latin:keySpec="U"
-                latin:keyHintLabel="7"
-                latin:additionalMoreKeys="7" />
-            <Key
-                latin:keySpec="I"
-                latin:keyHintLabel="8"
-                latin:additionalMoreKeys="8" />
-            <Key
-                latin:keySpec="O"
-                latin:keyHintLabel="9"
-                latin:additionalMoreKeys="9" />
-            <Key
-                latin:keySpec="P"
-                latin:keyHintLabel="0"
-                latin:additionalMoreKeys="0" />
-        </case>
-        <default>
-            <!-- U+10E5: "ქ" GEORGIAN LETTER GHAN -->
-            <Key
-                latin:keySpec="&#x10E5;"
-                latin:keyHintLabel="1"
-                latin:additionalMoreKeys="1" />
-            <!-- U+10EC: "წ" GEORGIAN LETTER CIL -->
-            <Key
-                latin:keySpec="&#x10EC;"
-                latin:keyHintLabel="2"
-                latin:additionalMoreKeys="2" />
-            <!-- U+10D4: "ე" GEORGIAN LETTER EN
-                 U+10F1: "ჱ" GEORGIAN LETTER HE -->
-            <Key
-                latin:keySpec="&#x10D4;"
-                latin:moreKeys="&#x10F1;"
-                latin:keyHintLabel="3"
-                latin:additionalMoreKeys="3" />
-            <!-- U+10E0: "რ" GEORGIAN LETTER RAE -->
-            <Key
-                latin:keySpec="&#x10E0;"
-                latin:keyHintLabel="4"
-                latin:additionalMoreKeys="4" />
-            <!-- U+10E2: "ტ" GEORGIAN LETTER TAR -->
-            <Key
-                latin:keySpec="&#x10E2;"
-                latin:keyHintLabel="5"
-                latin:additionalMoreKeys="5" />
-            <!-- U+10E7: "ყ" GEORGIAN LETTER QAR
-                 U+10F8: "ჸ" GEORGIAN LETTER ELIFI -->
-            <Key
-                latin:keySpec="&#x10E7;"
-                latin:moreKeys="&#x10F8;"
-                latin:keyHintLabel="6"
-                latin:additionalMoreKeys="6" />
-            <!-- U+10E3: "უ" GEORGIAN LETTER UN -->
-            <Key
-                latin:keySpec="&#x10E3;"
-                latin:keyHintLabel="7"
-                latin:additionalMoreKeys="7" />
-            <!-- U+10D8: "ი" GEORGIAN LETTER IN
-                 U+10F2: "ჲ" GEORGIAN LETTER HIE -->
-            <Key
-                latin:keySpec="&#x10D8;"
-                latin:moreKeys="&#x10F2;"
-                latin:keyHintLabel="8"
-                latin:additionalMoreKeys="8" />
-            <!-- U+10DD: "ო" GEORGIAN LETTER ON -->
-            <Key
-                latin:keySpec="&#x10DD;"
-                latin:keyHintLabel="9"
-                latin:additionalMoreKeys="9" />
-            <!-- U+10DE: "პ" GEORGIAN LETTER PAR -->
-            <Key
-                latin:keySpec="&#x10DE;"
-                latin:keyHintLabel="0"
-                latin:additionalMoreKeys="0" />
-        </default>
-    </switch>
-</merge>
diff --git a/java/res/xml/rowkeys_georgian2.xml b/java/res/xml/rowkeys_georgian2.xml
deleted file mode 100644
index 1d4b8ae89..000000000
--- a/java/res/xml/rowkeys_georgian2.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <switch>
-        <case
-            latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
-        >
-            <Key
-                latin:keySpec="A" />
-            <!-- U+10E8: "შ" GEORGIAN LETTER SHIN -->
-            <Key
-                latin:keySpec="&#x10E8;" />
-            <Key
-                latin:keySpec="D" />
-            <Key
-                latin:keySpec="F" />
-            <Key
-                latin:keySpec="G" />
-            <Key
-                latin:keySpec="H" />
-            <!-- U+10DF: "ჟ" GEORGIAN LETTER ZHAR -->
-            <Key
-                latin:keySpec="&#x10DF;" />
-            <Key
-                latin:keySpec="K" />
-            <Key
-                latin:keySpec="L" />
-        </case>
-        <default>
-            <!-- U+10D0: "ა" GEORGIAN LETTER AN
-                 U+10FA: "ჺ" GEORGIAN LETTER AIN -->
-            <Key
-                latin:keySpec="&#x10D0;"
-                latin:moreKeys="&#x10FA;" />
-            <!-- U+10E1: "ს" GEORGIAN LETTER SAN -->
-            <Key
-                latin:keySpec="&#x10E1;" />
-            <!-- U+10D3: "დ" GEORGIAN LETTER DON -->
-            <Key
-                latin:keySpec="&#x10D3;" />
-            <!-- U+10E4: "ფ" GEORGIAN LETTER PHAR
-                 U+10F6: "ჶ" GEORGIAN LETTER FI -->
-            <Key
-                latin:keySpec="&#x10E4;"
-                latin:moreKeys="&#x10F6;" />
-            <!-- U+10D2: "გ" GEORGIAN LETTER GAN
-                 U+10F9: "ჹ" GEORGIAN LETTER TURNED GAN -->
-            <Key
-                latin:keySpec="&#x10D2;"
-                latin:moreKeys="&#x10F9;" />
-            <!-- U+10F0: "ჰ" GEORGIAN LETTER HAE
-                 U+10F5: "ჵ" GEORGIAN LETTER HOE -->
-            <Key
-                latin:keySpec="&#x10F0;"
-                latin:moreKeys="&#x10F5;" />
-            <!-- U+10EF: "ჯ" GEORGIAN LETTER JHAN
-                 U+10F7: "ჷ" GEORGIAN LETTER YN -->
-            <Key
-                latin:keySpec="&#x10EF;"
-                latin:moreKeys="&#x10F7;" />
-            <!-- U+10D9: "კ" GEORGIAN LETTER KAN -->
-            <Key
-                latin:keySpec="&#x10D9;" />
-            <!-- U+10DA: "ლ" GEORGIAN LETTER LAS -->
-            <Key
-                latin:keySpec="&#x10DA;" />
-        </default>
-    </switch>
-</merge>
diff --git a/java/res/xml/rowkeys_georgian3.xml b/java/res/xml/rowkeys_georgian3.xml
deleted file mode 100644
index 106f140a4..000000000
--- a/java/res/xml/rowkeys_georgian3.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <switch>
-        <case
-            latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
-        >
-            <!-- U+10EB: "ძ" GEORGIAN LETTER JIL -->
-            <Key
-                latin:keySpec="&#x10EB;" />
-            <Key
-                latin:keySpec="X" />
-            <!-- U+10E9: "ჩ" GEORGIAN LETTER CHIN -->
-            <Key
-                latin:keySpec="&#x10E9;" />
-            <Key
-                latin:keySpec="V" />
-            <Key
-                latin:keySpec="B" />
-            <Key
-                latin:keySpec="N" />
-            <Key
-                latin:keySpec="M" />
-        </case>
-        <default>
-            <!-- U+10D6: "ზ" GEORGIAN LETTER ZEN -->
-            <Key
-                latin:keySpec="&#x10D6;" />
-            <!-- U+10EE: "ხ" GEORGIAN LETTER XAN
-                 U+10F4: "ჴ" GEORGIAN LETTER HAR -->
-            <Key
-                latin:keySpec="&#x10EE;"
-                latin:moreKeys="&#x10F4;" />
-            <!-- U+10EA: "ც" GEORGIAN LETTER CAN -->
-            <Key
-                latin:keySpec="&#x10EA;" />
-            <!-- U+10D5: "ვ" GEORGIAN LETTER VIN
-                 U+10F3: "ჳ" GEORGIAN LETTER WE -->
-            <Key
-                latin:keySpec="&#x10D5;"
-                latin:moreKeys="&#x10F3;" />
-            <!-- U+10D1: "ბ" GEORGIAN LETTER BAN -->
-            <Key
-                latin:keySpec="&#x10D1;" />
-            <!-- U+10DC: "ნ" GEORGIAN LETTER NAR
-                 U+10FC: "ჼ" MODIFIER LETTER GEORGIAN NAR -->
-            <Key
-                latin:keySpec="&#x10DC;"
-                latin:moreKeys="&#x10FC;" />
-            <!-- U+10DB: "მ" GEORGIAN LETTER MAN -->
-            <Key
-                latin:keySpec="&#x10DB;" />
-        </default>
-    </switch>
-</merge>
diff --git a/java/res/xml/rowkeys_greek1.xml b/java/res/xml/rowkeys_greek1.xml
deleted file mode 100644
index 5027ddbba..000000000
--- a/java/res/xml/rowkeys_greek1.xml
+++ /dev/null
@@ -1,158 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <switch>
-        <case
-            latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLockShifted"
-        >
-            <Key
-                latin:keySpec=":"
-                latin:keyHintLabel="1"
-                latin:moreKeys=";,&#x00B7;"
-                latin:additionalMoreKeys="1" />
-        </case>
-        <default>
-            <Key
-                latin:keySpec=";"
-                latin:keyHintLabel="1"
-                latin:moreKeys=":,&#x00B7;"
-                latin:additionalMoreKeys="1" />
-        </default>
-    </switch>
-    <!-- TODO: Should find a way to compound Greek dialytika tonos and other Greek letters. -->
-    <!--
-    <switch>
-        <case
-            latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLockShifted"
-        >
-            U+0385: "΅" GREEK DIALYTIKA TONOS
-            <Key
-                latin:keySpec="&#x0385;"
-                latin:keyHintLabel="2"
-                latin:additionalMoreKeys="2" />
-        </case>
-        <default>
-        -->
-            <!-- U+03C2: "ς" GREEK SMALL LETTER FINAL SIGMA -->
-            <Key
-                latin:keySpec="&#x03C2;"
-                latin:keyLabelFlags="preserveCase"
-                latin:keyHintLabel="2"
-                latin:additionalMoreKeys="2" />
-    <!--
-        </default>
-    </switch>
-        -->
-    <!-- U+03B5: "ε" GREEK SMALL LETTER EPSILON
-         U+03AD: "έ" GREEK SMALL LETTER EPSILON WITH TONOS
-         U+1F72: "ὲ" GREEK SMALL LETTER EPSILON WITH VARIA
-         U+1F10: "ἐ" GREEK SMALL LETTER EPSILON WITH PSILI
-         U+1F11: "ἑ" GREEK SMALL LETTER EPSILON WITH DASIA
-         U+1F14: "ἔ" GREEK SMALL LETTER EPSILON WITH PSILI AND OXIA
-         U+1F15: "ἕ" GREEK SMALL LETTER EPSILON WITH DASIA AND OXIA
-         U+1F12: "ἒ" GREEK SMALL LETTER EPSILON WITH PSILI AND VARIA
-         U+1F13: "ἓ" GREEK SMALL LETTER EPSILON WITH DASIA AND VARIA -->
-    <Key
-        latin:keySpec="&#x03B5;"
-        latin:keyHintLabel="3"
-        latin:additionalMoreKeys="3"
-        latin:moreKeys="&#x03AD;,%,&#x1F72;,&#x1F10;,&#x1F11;,&#x1F14;,&#x1F15;,&#x1F12;,&#x1F13;" />
-    <!-- U+03C1: "ρ" GREEK SMALL LETTER RHO
-         U+1FE5: "ῥ" GREEK SMALL LETTER RHO WITH DASIA -->
-    <Key
-        latin:keySpec="&#x03C1;"
-        latin:keyHintLabel="4"
-        latin:additionalMoreKeys="4"
-        latin:moreKeys="%,&#x1FE5;" />
-    <!-- U+03C4: "τ" GREEK SMALL LETTER TAU -->
-    <Key
-        latin:keySpec="&#x03C4;"
-        latin:keyHintLabel="5"
-        latin:additionalMoreKeys="5" />
-    <!-- U+03C5: "υ" GREEK SMALL LETTER UPSILON
-         U+03CD: "ύ" GREEK SMALL LETTER UPSILON WITH TONOS
-         U+03CB: "ϋ" GREEK SMALL LETTER UPSILON WITH DIALYTIKA
-         U+03B0: "ΰ" GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND TONOS
-         U+1F7A: "ὺ" GREEK SMALL LETTER UPSILON WITH VARIA
-         U+1FE6: "ῦ" GREEK SMALL LETTER UPSILON WITH PERISPOMENI
-         U+1F50: "ὐ" GREEK SMALL LETTER UPSILON WITH PSILI
-         U+1F51: "ὑ" GREEK SMALL LETTER UPSILON WITH DASIA
-         U+1F54: "ὔ" GREEK SMALL LETTER UPSILON WITH PSILI AND OXIA
-         U+1F55: "ὕ" GREEK SMALL LETTER UPSILON WITH DASIA AND OXIA
-         U+1F52: "ὒ" GREEK SMALL LETTER UPSILON WITH PSILI AND VARIA
-         U+1F53: "ὓ" GREEK SMALL LETTER UPSILON WITH DASIA AND VARIA
-         U+1F56: "ὖ" GREEK SMALL LETTER UPSILON WITH PSILI AND PERISPOMENI
-         U+1F57: "ὗ" GREEK SMALL LETTER UPSILON WITH DASIA AND PERISPOMENI
-         U+1FE2: "ῢ" GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND VARIA
-         U+1FE7: "ῧ" GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND PERISPOMENI -->
-    <Key
-        latin:keySpec="&#x03C5;"
-        latin:keyHintLabel="6"
-        latin:additionalMoreKeys="6"
-        latin:moreKeys="&#x03CD;,%,&#x03CB;,&#x03B0;,&#x1F7A;,&#x1FE6;,&#x1F50;,&#x1F51;,&#x1F54;,&#x1F55;,&#x1F52;,&#x1F53;,&#x1F56;,&#x1F57;,&#x1FE2;,&#x1FE7;" />
-    <!-- U+03B8: "θ" GREEK SMALL LETTER THETA -->
-    <Key
-        latin:keySpec="&#x03B8;"
-        latin:keyHintLabel="7"
-        latin:additionalMoreKeys="7" />
-    <!-- U+03B9: "ι" GREEK SMALL LETTER IOTA
-         U+03AF: "ί" GREEK SMALL LETTER IOTA WITH TONOS
-         U+03CA: "ϊ" GREEK SMALL LETTER IOTA WITH DIALYTIKA
-         U+0390: "ΐ" GREEK SMALL LETTER IOTA WITH DIALYTIKA AND TONOS
-         U+1F76: "ὶ" GREEK SMALL LETTER IOTA WITH VARIA
-         U+1FD6: "ῖ" GREEK SMALL LETTER IOTA WITH PERISPOMENI
-         U+1F30: "ἰ" GREEK SMALL LETTER IOTA WITH PSILI
-         U+1F31: "ἱ" GREEK SMALL LETTER IOTA WITH DASIA
-         U+1F34: "ἴ" GREEK SMALL LETTER IOTA WITH PSILI AND OXIA
-         U+1F35: "ἵ" GREEK SMALL LETTER IOTA WITH DASIA AND OXIA
-         U+1F32: "ἲ" GREEK SMALL LETTER IOTA WITH PSILI AND VARIA
-         U+1F33: "ἳ" GREEK SMALL LETTER IOTA WITH DASIA AND VARIA
-         U+1F36: "ἶ" GREEK SMALL LETTER IOTA WITH PSILI AND PERISPOMENI
-         U+1F37: "ἷ" GREEK SMALL LETTER IOTA WITH DASIA AND PERISPOMENI
-         U+1FD2: "ῒ" GREEK SMALL LETTER IOTA WITH DIALYTIKA AND VARIA
-         U+1FD7: "ῗ" GREEK SMALL LETTER IOTA WITH DIALYTIKA AND PERISPOMENI -->
-    <Key
-        latin:keySpec="&#x03B9;"
-        latin:keyHintLabel="8"
-        latin:additionalMoreKeys="8"
-        latin:moreKeys="&#x03AF;,%,&#x03CA;,&#x0390;,&#x1F76;,&#x1FD6;,&#x1F30;,&#x1F31;,&#x1F34;,&#x1F35;,&#x1F32;,&#x1F33;,&#x1F36;,&#x1F37;,&#x1FD2;,&#x1FD7;" />
-    <!-- U+03BF: "ο" GREEK SMALL LETTER OMICRON
-         U+03CC: "ό" GREEK SMALL LETTER OMICRON WITH TONOS
-         U+1F78: "ὸ" GREEK SMALL LETTER OMICRON WITH VARIA
-         U+1F40: "ὀ" GREEK SMALL LETTER OMICRON WITH PSILI
-         U+1F41: "ὁ" GREEK SMALL LETTER OMICRON WITH DASIA
-         U+1F44: "ὄ" GREEK SMALL LETTER OMICRON WITH PSILI AND OXIA
-         U+1F45: "ὅ" GREEK SMALL LETTER OMICRON WITH DASIA AND OXIA
-         U+1F42: "ὂ" GREEK SMALL LETTER OMICRON WITH PSILI AND VARIA
-         U+1F43: "ὃ" GREEK SMALL LETTER OMICRON WITH DASIA AND VARIA -->
-    <Key
-        latin:keySpec="&#x03BF;"
-        latin:keyHintLabel="9"
-        latin:additionalMoreKeys="9"
-        latin:moreKeys="&#x03CC;,%,&#x1F78;,&#x1F40;,&#x1F41;,&#x1F44;,&#x1F45;,&#x1F42;,&#x1F43;" />
-    <!-- U+03C0: "π" GREEK SMALL LETTER PI -->
-    <Key
-        latin:keySpec="&#x03C0;"
-        latin:keyHintLabel="0"
-        latin:additionalMoreKeys="0" />
-</merge>
diff --git a/java/res/xml/rowkeys_greek2.xml b/java/res/xml/rowkeys_greek2.xml
deleted file mode 100644
index 81c1347eb..000000000
--- a/java/res/xml/rowkeys_greek2.xml
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <switch>
-        <case
-            latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLockShifted"
-        >
-            <!-- U+0391: "Α" GREEK CAPITAL LETTER ALPHA
-                 U+0386: "Ά" GREEK CAPITAL LETTER ALPHA WITH TONOS
-                 U+1FBA: "Ὰ" GREEK CAPITAL LETTER ALPHA WITH VARIA
-                 U+1F08: "Ἀ" GREEK CAPITAL LETTER ALPHA WITH PSILI
-                 U+1F09: "Ἁ" GREEK CAPITAL LETTER ALPHA WITH DASIA
-                 U+1F04: "Ἄ" GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA
-                 U+1F05: "Ἅ" GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA
-                 U+1F0A: "Ἂ" GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA
-                 U+1F0B: "Ἃ" GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA
-                 U+1F0E: "Ἆ" GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI
-                 U+1F0F: "Ἇ" GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI -->
-            <Key
-                latin:keySpec="&#x0391;"
-                latin:moreKeys="&#x0386;,&#x1FBA;,&#x1F08;,&#x1F09;,&#x1F04;,&#x1F05;,&#x1F0A;,&#x1F0B;,&#x1F0E;,&#x1F0F;" />
-        </case>
-        <default>
-            <!-- U+03B1: "α" GREEK SMALL LETTER ALPHA
-                 U+03AC: "ά" GREEK SMALL LETTER ALPHA WITH TONOS
-                 U+1F70: "ὰ" GREEK SMALL LETTER ALPHA WITH VARIA
-                 U+1FB6: "ᾶ" GREEK SMALL LETTER ALPHA WITH PERISPOMENI
-                 U+1F00: "ἀ" GREEK SMALL LETTER ALPHA WITH PSILI
-                 U+1F01: "ἁ" GREEK SMALL LETTER ALPHA WITH DASIA
-                 U+1F04: "ἄ" GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA
-                 U+1F05: "ἅ" GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA
-                 U+1F02: "ἂ" GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA
-                 U+1F03: "ἃ" GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA
-                 U+1F06: "ἆ" GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI
-                 U+1F07: "ἇ" GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI
-                 U+1FB3: "ᾳ" GREEK SMALL LETTER ALPHA WITH YPOGEGRAMMENI
-                 U+1FB4: "ᾴ" GREEK SMALL LETTER ALPHA WITH OXIA AND YPOGEGRAMMENI
-                 U+1FB2: "ᾲ" GREEK SMALL LETTER ALPHA WITH VARIA AND YPOGEGRAMMENI
-                 U+1FB7: "ᾷ" GREEK SMALL LETTER ALPHA WITH PERISPOMENI AND YPOGEGRAMMENI
-                 U+1F80: "ᾀ" GREEK SMALL LETTER ALPHA WITH PSILI AND YPOGEGRAMMENI
-                 U+1F81: "ᾁ" GREEK SMALL LETTER ALPHA WITH DASIA AND YPOGEGRAMMENI
-                 U+1F84: "ᾄ" GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-                 U+1F85: "ᾅ" GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-                 U+1F82: "ᾂ" GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA AND YPOGEGRAMMENI
-                 U+1F83: "ᾃ" GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA AND YPOGEGRAMMENI
-                 U+1F86: "ᾆ" GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
-                 U+1F87: "ᾇ" GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI -->
-            <Key
-                latin:keySpec="&#x03B1;"
-                latin:moreKeys="&#x03AC;,&#x1F70;,&#x1FB6;,&#x1F00;,&#x1F01;,&#x1F04;,&#x1F05;,&#x1F02;,&#x1F03;,&#x1F06;,&#x1F07;,&#x1FB3;,&#x1FB4;,&#x1FB2;,&#x1FB7;,&#x1F80;,&#x1F81;,&#x1F84;,&#x1F85;,&#x1F82;,&#x1F83;,&#x1F86;,&#x1F87;" />
-        </default>
-    </switch>
-    <!-- U+03C3: "σ" GREEK SMALL LETTER SIGMA -->
-    <Key
-        latin:keySpec="&#x03C3;" />
-    <!-- U+03B4: "δ" GREEK SMALL LETTER DELTA -->
-    <Key
-        latin:keySpec="&#x03B4;" />
-    <!-- U+03C6: "φ" GREEK SMALL LETTER PHI -->
-    <Key
-        latin:keySpec="&#x03C6;" />
-    <!-- U+03B3: "γ" GREEK SMALL LETTER GAMMA -->
-    <Key
-        latin:keySpec="&#x03B3;" />
-    <switch>
-        <case
-            latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLockShifted"
-        >
-            <!-- U+0397: "Η" GREEK CAPITAL LETTER ETA
-                 U+0389: "Ή" GREEK CAPITAL LETTER ETA WITH TONOS
-                 U+1FCA: "Ὴ" GREEK CAPITAL LETTER ETA WITH VARIA
-                 U+1F28: "Ἠ" GREEK CAPITAL LETTER ETA WITH PSILI
-                 U+1F29: "Ἡ" GREEK CAPITAL LETTER ETA WITH DASIA
-                 U+1F2C: "Ἤ" GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA
-                 U+1F2D: "Ἥ" GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA
-                 U+1F2A: "Ἢ" GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA
-                 U+1F2B: "Ἣ" GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA
-                 U+1F2E: "Ἦ" GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI
-                 U+1F2F: "Ἧ" GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI -->
-            <Key
-                latin:keySpec="&#x0397;"
-                latin:moreKeys="&#x0389;,&#x1FCA;,&#x1F28;,&#x1F29;,&#x1F2C;,&#x1F2D;,&#x1F2A;,&#x1F2B;,&#x1F2E;,&#x1F2F;" />
-        </case>
-        <default>
-            <!-- U+03B7: "η" GREEK SMALL LETTER ETA
-                 U+03AE: "ή" GREEK SMALL LETTER ETA WITH TONOS
-                 U+1F74: "ὴ" GREEK SMALL LETTER ETA WITH VARIA
-                 U+1FC6: "ῆ" GREEK SMALL LETTER ETA WITH PERISPOMENI
-                 U+1F20: "ἠ" GREEK SMALL LETTER ETA WITH PSILI
-                 U+1F21: "ἡ" GREEK SMALL LETTER ETA WITH DASIA
-                 U+1F24: "ἤ" GREEK SMALL LETTER ETA WITH PSILI AND OXIA
-                 U+1F25: "ἥ" GREEK SMALL LETTER ETA WITH DASIA AND OXIA
-                 U+1F22: "ἢ" GREEK SMALL LETTER ETA WITH PSILI AND VARIA
-                 U+1F23: "ἣ" GREEK SMALL LETTER ETA WITH DASIA AND VARIA
-                 U+1F26: "ἦ" GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI
-                 U+1F27: "ἧ" GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI
-                 U+1FC3: "ῃ" GREEK SMALL LETTER ETA WITH YPOGEGRAMMENI
-                 U+1FC4: "ῄ" GREEK SMALL LETTER ETA WITH OXIA AND YPOGEGRAMMENI
-                 U+1FC2: "ῂ" GREEK SMALL LETTER ETA WITH VARIA AND YPOGEGRAMMENI
-                 U+1FC7: "ῇ" GREEK SMALL LETTER ETA WITH PERISPOMENI AND YPOGEGRAMMENI
-                 U+1F90: "ᾐ" GREEK SMALL LETTER ETA WITH PSILI AND YPOGEGRAMMENI
-                 U+1F91: "ᾑ" GREEK SMALL LETTER ETA WITH DASIA AND YPOGEGRAMMENI
-                 U+1F94: "ᾔ" GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-                 U+1F95: "ᾕ" GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-                 U+1F92: "ᾒ" GREEK SMALL LETTER ETA WITH PSILI AND VARIA AND YPOGEGRAMMENI
-                 U+1F93: "ᾓ" GREEK SMALL LETTER ETA WITH DASIA AND VARIA AND YPOGEGRAMMENI
-                 U+1F96: "ᾖ" GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
-                 U+1F97: "ᾗ" GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI -->
-            <Key
-                latin:keySpec="&#x03B7;"
-                latin:moreKeys="&#x03AE;,&#x1F74;,&#x1FC6;,&#x1F20;,&#x1F21;,&#x1F24;,&#x1F25;,&#x1F22;,&#x1F23;,&#x1F26;,&#x1F27;,&#x1FC3;,&#x1FC4;,&#x1FC2;,&#x1FC7;,&#x1F90;,&#x1F91;,&#x1F94;,&#x1F95;,&#x1F92;,&#x1F93;,&#x1F96;,&#x1F97;" />
-        </default>
-    </switch>
-    <!-- U+03BE: "ξ" GREEK SMALL LETTER XI -->
-    <Key
-        latin:keySpec="&#x03BE;" />
-    <!-- U+03BA: "κ" GREEK SMALL LETTER KAPPA -->
-    <Key
-        latin:keySpec="&#x03BA;" />
-    <!-- U+03BB: "λ" GREEK SMALL LETTER LAMDA -->
-    <Key
-        latin:keySpec="&#x03BB;" />
-</merge>
diff --git a/java/res/xml/rowkeys_greek3.xml b/java/res/xml/rowkeys_greek3.xml
deleted file mode 100644
index 0d11f6172..000000000
--- a/java/res/xml/rowkeys_greek3.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <!-- U+03B6: "ζ" GREEK SMALL LETTER ZETA -->
-    <Key
-        latin:keySpec="&#x03B6;" />
-    <!-- U+03C7: "χ" GREEK SMALL LETTER CHI -->
-    <Key
-        latin:keySpec="&#x03C7;" />
-    <!-- U+03C8: "ψ" GREEK SMALL LETTER PSI -->
-    <Key
-        latin:keySpec="&#x03C8;" />
-    <switch>
-        <case
-            latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLockShifted"
-        >
-            <!-- U+03A9: "Ω" GREEK CAPITAL LETTER OMEGA
-                 U+038F: "Ώ" GREEK CAPITAL LETTER OMEGA WITH TONOS
-                 U+1FFA: "Ὼ" GREEK CAPITAL LETTER OMEGA WITH VARIA
-                 U+1F68: "Ὠ" GREEK CAPITAL LETTER OMEGA WITH PSILI
-                 U+1F69: "Ὡ" GREEK CAPITAL LETTER OMEGA WITH DASIA
-                 U+1F6C: "Ὤ" GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA
-                 U+1F6D: "Ὥ" GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA
-                 U+1F6A: "Ὢ" GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA
-                 U+1F6B: "Ὣ" GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA
-                 U+1F6E: "Ὦ" GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI
-                 U+1F6F: "Ὧ" GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI -->
-            <Key
-                latin:keySpec="&#x03C9;"
-                latin:moreKeys="&#x038F;,&#x1FFA;,&#x1F68;,&#x1F69;,&#x1F6C;,&#x1F6D;,&#x1F6A;,&#x1F6B;,&#x1F6E;,&#x1F6F;" />
-        </case>
-        <default>
-            <!-- U+03C9: "ω" GREEK SMALL LETTER OMEGA
-                 U+03CE: "ώ" GREEK SMALL LETTER OMEGA WITH TONOS
-                 U+1F7C: "ὼ" GREEK SMALL LETTER OMEGA WITH VARIA
-                 U+1FF6: "ῶ" GREEK SMALL LETTER OMEGA WITH PERISPOMENI
-                 U+1F60: "ὠ" GREEK SMALL LETTER OMEGA WITH PSILI
-                 U+1F61: "ὡ" GREEK SMALL LETTER OMEGA WITH DASIA
-                 U+1F64: "ὤ" GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA
-                 U+1F65: "ὥ" GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA
-                 U+1F62: "ὢ" GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA
-                 U+1F63: "ὣ" GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA
-                 U+1F66: "ὦ" GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI
-                 U+1F67: "ὧ" GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI
-                 U+1FF3: "ῳ" GREEK SMALL LETTER OMEGA WITH YPOGEGRAMMENI
-                 U+1FF4: "ῴ" GREEK SMALL LETTER OMEGA WITH OXIA AND YPOGEGRAMMENI
-                 U+1FF2: "ῲ" GREEK SMALL LETTER OMEGA WITH VARIA AND YPOGEGRAMMENI
-                 U+1FF7: "ῷ" GREEK SMALL LETTER OMEGA WITH PERISPOMENI AND YPOGEGRAMMENI
-                 U+1FA0: "ᾠ" GREEK SMALL LETTER OMEGA WITH PSILI AND YPOGEGRAMMENI
-                 U+1FA1: "ᾡ" GREEK SMALL LETTER OMEGA WITH DASIA AND YPOGEGRAMMENI
-                 U+1FA4: "ᾤ" GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-                 U+1FA5: "ᾥ" GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-                 U+1FA2: "ᾢ" GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA AND YPOGEGRAMMENI
-                 U+1FA3: "ᾣ" GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA AND YPOGEGRAMMENI
-                 U+1FA6: "ᾦ" GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
-                 U+1FA7: "ᾧ" GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI -->
-            <Key
-                latin:keySpec="&#x03C9;"
-                latin:moreKeys="&#x03CE;,&#x1F7C;,&#x1FF6;,&#x1F60;,&#x1F61;,&#x1F64;,&#x1F65;,&#x1F62;,&#x1F63;,&#x1F66;,&#x1F67;,&#x1FF3;,&#x1FF4;,&#x1FF2;,&#x1FF7;,&#x1FA0;,&#x1FA1;,&#x1FA4;,&#x1FA5;,&#x1FA2;,&#x1FA3;,&#x1FA6;,&#x1FA7;" />
-        </default>
-    </switch>
-    <!-- U+03B2: "β" GREEK SMALL LETTER BETA -->
-    <Key
-        latin:keySpec="&#x03B2;" />
-    <!-- U+03BD: "ν" GREEK SMALL LETTER NU -->
-    <Key
-        latin:keySpec="&#x03BD;" />
-    <!-- U+03BC: "μ" GREEK SMALL LETTER MU -->
-    <Key
-        latin:keySpec="&#x03BC;" />
-</merge>
diff --git a/java/res/xml/rowkeys_hebrew1.xml b/java/res/xml/rowkeys_hebrew1.xml
deleted file mode 100644
index d55b7cfac..000000000
--- a/java/res/xml/rowkeys_hebrew1.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <switch>
-        <case
-            latin:mode="email|url"
-        >
-            <Key
-                latin:keySpec="-"
-                latin:keyHintLabel="1"
-                latin:additionalMoreKeys="1" />
-            <Key
-                latin:keySpec="_"
-                latin:keyHintLabel="2"
-                latin:additionalMoreKeys="2" />
-        </case>
-        <default>
-            <Key
-                latin:keySpec="\'"
-                latin:keyHintLabel="1"
-                latin:additionalMoreKeys="1"
-                latin:moreKeys="&quot;" />
-            <Key
-                latin:keySpec="-"
-                latin:keyHintLabel="2"
-                latin:additionalMoreKeys="2"
-                latin:moreKeys="_" />
-        </default>
-    </switch>
-    <!-- U+05E7: "ק" HEBREW LETTER QOF -->
-    <Key
-        latin:keySpec="&#x05E7;"
-        latin:keyHintLabel="3"
-        latin:additionalMoreKeys="3" />
-    <!-- U+05E8: "ר" HEBREW LETTER RESH -->
-    <Key
-        latin:keySpec="&#x05E8;"
-        latin:keyHintLabel="4"
-        latin:additionalMoreKeys="4" />
-    <!-- U+05D0: "א" HEBREW LETTER ALEF -->
-    <Key
-        latin:keySpec="&#x05D0;"
-        latin:keyHintLabel="5"
-        latin:additionalMoreKeys="5" />
-    <!-- U+05D8: "ט" HEBREW LETTER TET -->
-    <Key
-        latin:keySpec="&#x05D8;"
-        latin:keyHintLabel="6"
-        latin:additionalMoreKeys="6" />
-    <!-- U+05D5: "ו" HEBREW LETTER VAV -->
-    <Key
-        latin:keySpec="&#x05D5;"
-        latin:keyHintLabel="7"
-        latin:additionalMoreKeys="7" />
-    <!-- U+05DF: "ן" HEBREW LETTER FINAL NUN -->
-    <Key
-        latin:keySpec="&#x05DF;"
-        latin:keyHintLabel="8"
-        latin:additionalMoreKeys="8" />
-    <!-- U+05DD: "ם" HEBREW LETTER FINAL MEM -->
-    <Key
-        latin:keySpec="&#x05DD;"
-        latin:keyHintLabel="9"
-        latin:additionalMoreKeys="9" />
-    <!-- U+05E4: "פ" HEBREW LETTER PE -->
-    <Key
-        latin:keySpec="&#x05E4;"
-        latin:keyHintLabel="0"
-        latin:additionalMoreKeys="0" />
-</merge>
diff --git a/java/res/xml/rowkeys_hebrew2.xml b/java/res/xml/rowkeys_hebrew2.xml
deleted file mode 100644
index 4c692f122..000000000
--- a/java/res/xml/rowkeys_hebrew2.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <!-- U+05E9: "ש" HEBREW LETTER SHIN -->
-    <Key
-        latin:keySpec="&#x05E9;" />
-    <!-- U+05D3: "ד" HEBREW LETTER DALET -->
-    <Key
-        latin:keySpec="&#x05D3;" />
-    <!-- U+05D2: "ג" HEBREW LETTER GIMEL
-         U+05D2 U+05F3: "ג׳" HEBREW LETTER GIMEL + HEBREW PUNCTUATION GERESH -->
-    <Key
-        latin:keySpec="&#x05D2;"
-        latin:moreKeys="&#x05D2;&#x05F3;" />
-    <!-- U+05DB: "כ" HEBREW LETTER KAF -->
-    <Key
-        latin:keySpec="&#x05DB;" />
-    <!-- U+05E2: "ע" HEBREW LETTER AYIN -->
-    <Key
-        latin:keySpec="&#x05E2;" />
-    <!-- U+05D9: "י" HEBREW LETTER YOD
-         U+05F2 U+05B7: "ײַ" HEBREW LIGATURE YIDDISH DOUBLE YOD + HEBREW POINT PATAH -->
-    <Key
-        latin:keySpec="&#x05D9;"
-        latin:moreKeys="&#x05F2;&#x05B7;" />
-    <!-- U+05D7: "ח" HEBREW LETTER HET
-         U+05D7 U+05F3: "ח׳" HEBREW LETTER HET + HEBREW PUNCTUATION GERESH -->
-    <Key
-        latin:keySpec="&#x05D7;"
-        latin:moreKeys="&#x05D7;&#x05F3;" />
-    <!-- U+05DC: "ל" HEBREW LETTER LAMED -->
-    <Key
-        latin:keySpec="&#x05DC;" />
-    <!-- U+05DA: "ך" HEBREW LETTER FINAL KAF -->
-    <Key
-        latin:keySpec="&#x05DA;" />
-    <!-- U+05E3: "ף" HEBREW LETTER FINAL PE -->
-    <Key
-        latin:keySpec="&#x05E3;" />
-</merge>
diff --git a/java/res/xml/rowkeys_hebrew3.xml b/java/res/xml/rowkeys_hebrew3.xml
deleted file mode 100644
index 6db9bacf0..000000000
--- a/java/res/xml/rowkeys_hebrew3.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <!-- U+05D6: "ז" HEBREW LETTER ZAYIN
-         U+05D6 U+05F3: "ז׳" HEBREW LETTER ZAYIN + HEBREW PUNCTUATION GERESH -->
-    <Key
-        latin:keySpec="&#x05D6;"
-        latin:moreKeys="&#x05D6;&#x05F3;" />
-    <!-- U+05E1: "ס" HEBREW LETTER SAMEKH -->
-    <Key
-        latin:keySpec="&#x05E1;" />
-    <!-- U+05D1: "ב" HEBREW LETTER BET -->
-    <Key
-        latin:keySpec="&#x05D1;" />
-    <!-- U+05D4: "ה" HEBREW LETTER HE -->
-    <Key
-        latin:keySpec="&#x05D4;" />
-    <!-- U+05E0: "נ" HEBREW LETTER NUN -->
-    <Key
-        latin:keySpec="&#x05E0;" />
-    <!-- U+05DE: "מ" HEBREW LETTER MEM -->
-    <Key
-        latin:keySpec="&#x05DE;" />
-    <!-- U+05E6: "צ" HEBREW LETTER TSADI
-         U+05E6 U+05F3: "צ׳" HEBREW LETTER TSADI + HEBREW PUNCTUATION GERESH -->
-    <Key
-        latin:keySpec="&#x05E6;"
-        latin:moreKeys="&#x05E6;&#x05F3;" />
-    <!-- U+05EA: "ת" HEBREW LETTER TAV
-         U+05EA U+05F3: "ת׳" HEBREW LETTER TAV + HEBREW PUNCTUATION GERESH -->
-    <Key
-        latin:keySpec="&#x05EA;"
-        latin:moreKeys="&#x05EA;&#x05F3;" />
-    <!-- U+05E5: "ץ" HEBREW LETTER FINAL TSADI
-         U+05E5 U+05F3: "ץ׳" HEBREW LETTER FINAL TSADI + HEBREW PUNCTUATION GERESH -->
-    <Key
-        latin:keySpec="&#x05E5;"
-        latin:moreKeys="&#x05E5;&#x05F3;" />
-</merge>
diff --git a/java/res/xml/rowkeys_hindi1.xml b/java/res/xml/rowkeys_hindi1.xml
deleted file mode 100644
index d1ae43515..000000000
--- a/java/res/xml/rowkeys_hindi1.xml
+++ /dev/null
@@ -1,165 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <switch>
-        <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
-            <!-- U+0914: "औ" DEVANAGARI LETTER AU
-                 U+0912/U+0902: "ऒं" DEVANAGARI LETTER SHORT O//DEVANAGARI SIGN ANUSVARA -->
-            <Key
-                latin:keySpec="&#x0914;"
-                latin:moreKeys="&#x0912;&#x0902;" />
-            <!-- U+0910: "ऐ" DEVANAGARI LETTER AI
-                 U+0910/U+0902: "ऐं" DEVANAGARI LETTER AI/DEVANAGARI SIGN ANUSVARA -->
-            <Key
-                latin:keySpec="&#x0910;"
-                latin:moreKeys="&#x0910;&#x0902;" />
-            <!-- U+0906: "आ" DEVANAGARI LETTER AA
-                 U+0906/U+0902: "आं" DEVANAGARI LETTER AA/DEVANAGARI SIGN ANUSVARA
-                 U+0906/U+0901: "आँ" DEVANAGARI LETTER AA/DEVANAGARI SIGN CANDRABINDU -->
-            <Key
-                latin:keySpec="&#x0906;"
-                latin:moreKeys="&#x0906;&#x0902;,&#x0906;&#x0901;" />
-            <!-- U+0908: "ई" DEVANAGARI LETTER II
-                 U+0908/U+0902: "ईं" DEVANAGARI LETTER II/DEVANAGARI SIGN ANUSVARA -->
-            <Key
-                latin:keySpec="&#x0908;"
-                latin:moreKeys="&#x0908;&#x0902;" />
-            <!-- U+090A: "ऊ" DEVANAGARI LETTER UU
-                 U+090A/U+0902: "ऊं" DEVANAGARI LETTER UU/DEVANAGARI SIGN ANUSVARA
-                 U+090A/U+0901: "ऊँ" DEVANAGARI LETTER UU/DEVANAGARI SIGN CANDRABINDU -->
-            <Key
-                latin:keySpec="&#x090A;"
-                latin:moreKeys="&#x090A;&#x0902;,&#x090A;&#x0901;" />
-            <!-- U+092D: "भ" DEVANAGARI LETTER BHA -->
-            <Key latin:keySpec="&#x092D;" />
-            <!-- Because the font rendering system prior to API version 16 can't automatically
-                 render dotted circle for incomplete combining letter of some scripts, different
-                 set of Key definitions are needed based on the API version. -->
-            <include latin:keyboardLayout="@xml/keystyle_devanagari_sign_visarga" />
-            <Key latin:keyStyle="baseKeyDevanagariSignVisarga" />
-            <!-- U+0918: "घ" DEVANAGARI LETTER GHA -->
-            <Key latin:keySpec="&#x0918;" />
-            <!-- U+0927: "ध" DEVANAGARI LETTER DHA
-                 U+0915/U+094D/U+0937: "क्ष" DEVANAGARI LETTER KA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER SSA
-                 U+0936/U+094D/U+0930: "श्र" DEVANAGARI LETTER SHA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER RA -->
-            <Key
-                latin:keySpec="&#x0927;"
-                latin:moreKeys="&#x0915;&#x094D;&#x0937;,&#x0936;&#x094D;&#x0930;" />
-            <!-- U+091D: "झ" DEVANAGARI LETTER JHA -->
-            <Key latin:keySpec="&#x091D;" />
-            <!-- U+0922: "ढ" DEVANAGARI LETTER DDHA -->
-            <Key latin:keySpec="&#x0922;" />
-        </case>
-        <default>
-            <!-- Because the font rendering system prior to API version 16 can't automatically
-                 render dotted circle for incomplete combining letter of some scripts, different
-                 set of Key definitions are needed based on the API version. -->
-            <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_au" />
-            <!-- U+0967: "१" DEVANAGARI DIGIT ONE -->
-            <Key
-                latin:keyStyle="baseKeyDevanagariVowelSignAu"
-                latin:keyHintLabel="1"
-                latin:additionalMoreKeys="&#x0967;,1" />
-            <!-- Because the font rendering system prior to API version 16 can't automatically
-                 render dotted circle for incomplete combining letter of some scripts, different
-                 set of Key definitions are needed based on the API version. -->
-            <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_ai" />
-            <!-- U+0968: "२" DEVANAGARI DIGIT TWO -->
-            <Key
-                latin:keyStyle="baseKeyDevanagariVowelSignAi"
-                latin:keyHintLabel="2"
-                latin:additionalMoreKeys="&#x0968;,2" />
-            <!-- Because the font rendering system prior to API version 16 can't automatically
-                 render dotted circle for incomplete combining letter of some scripts, different
-                 set of Key definitions are needed based on the API version. -->
-            <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_aa" />
-            <!-- U+0969: "३" DEVANAGARI DIGIT THREE -->
-            <Key
-                latin:keyStyle="baseKeyDevanagariVowelSignAa"
-                latin:keyHintLabel="3"
-                latin:additionalMoreKeys="&#x0969;,3" />
-            <!-- Because the font rendering system prior to API version 16 can't automatically
-                 render dotted circle for incomplete combining letter of some scripts, different
-                 set of Key definitions are needed based on the API version. -->
-            <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_ii" />
-            <!-- U+096A: "४" DEVANAGARI DIGIT FOUR -->
-            <Key
-                latin:keyStyle="baseKeyDevanagariVowelSignIi"
-                latin:keyHintLabel="4"
-                latin:additionalMoreKeys="&#x096A;,4" />
-            <!-- Because the font rendering system prior to API version 16 can't automatically
-                 render dotted circle for incomplete combining letter of some scripts, different
-                 set of Key definitions are needed based on the API version. -->
-            <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_uu" />
-            <!-- U+096B: "५" DEVANAGARI DIGIT FIVE -->
-            <Key
-                latin:keyStyle="baseKeyDevanagariVowelSignUu"
-                latin:keyHintLabel="5"
-                latin:additionalMoreKeys="&#x096B;,5" />
-            <!-- U+092C: "ब" DEVANAGARI LETTER BA
-                 U+092C/U+0952: "ब॒" DEVANAGARI LETTER BA/DEVANAGARI STRESS SIGN ANUDATTA
-                 U+096C: "६" DEVANAGARI DIGIT SIX -->
-            <Key
-                latin:keySpec="&#x092C;"
-                latin:moreKeys="&#x092C;&#x0952;,%"
-                latin:keyHintLabel="6"
-                latin:additionalMoreKeys="&#x096C;,6" />
-            <!-- U+0939: "ह" DEVANAGARI LETTER HA
-                 U+096D: "७" DEVANAGARI DIGIT SEVEN -->
-            <Key
-                latin:keySpec="&#x0939;"
-                latin:keyHintLabel="7"
-                latin:additionalMoreKeys="&#x096D;,7" />
-            <!-- U+0917: "ग" DEVANAGARI LETTER GA
-                 U+091C/U+094D/U+091E: "ज्ञ" DEVANAGARI LETTER JA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER NYA
-                 U+0917/U+093C: "ग़" DEVANAGARI LETTER GA/DEVANAGARI SIGN NUKTA
-                 U+0917/U+0952: "ग॒" DEVANAGARI LETTER GA/DEVANAGARI STRESS SIGN ANUDATTA
-                 U+096E: "८" DEVANAGARI DIGIT EIGHT -->
-            <Key
-                latin:keySpec="&#x0917;"
-                latin:moreKeys="&#x091C;&#x094D;&#x091E;,&#x0917;&#x093C;,&#x0917;&#x0952;,%"
-                latin:keyHintLabel="8"
-                latin:additionalMoreKeys="&#x096E;,8" />
-            <!-- U+0926: "द" DEVANAGARI LETTER DA
-                 U+096F: "९" DEVANAGARI DIGIT NINE -->
-            <Key
-                latin:keySpec="&#x0926;"
-                latin:keyHintLabel="9"
-                latin:additionalMoreKeys="&#x096F;,9" />
-            <!-- U+091C: "ज" DEVANAGARI LETTER JA
-                 U+091C/U+0952: "ज॒" DEVANAGARI LETTER JA/DEVANAGARI STRESS SIGN ANUDATTA
-                 U+091C/U+094D/U+091E: "ज्ञ" DEVANAGARI LETTER JA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER NYA
-                 U+091C/U+093C: "ज़" DEVANAGARI LETTER JA/DEVANAGARI SIGN NUKTA
-                 U+0966: "०" DEVANAGARI DIGIT ZERO -->
-            <Key
-                latin:keySpec="&#x091C;"
-                latin:moreKeys="&#x091C;&#x0952;,&#x091C;&#x094D;&#x091E;,&#x091C;&#x093C;,%"
-                latin:keyHintLabel="0"
-                latin:additionalMoreKeys="&#x0966;,0" />
-            <!-- U+0921: "ड" DEVANAGARI LETTER DDA
-                 U+0921/U+0952: "ड॒" DEVANAGARI LETTER DDA/DEVANAGARI STRESS SIGN ANUDATTA
-                 U+0921/U+093C: "ड़" DEVANAGARI LETTER DDA/DEVANAGARI SIGN NUKTA -->
-            <Key
-                latin:keySpec="&#x0921;"
-                latin:moreKeys="&#x0921;&#x0952;,&#x0921;&#x093C;" />
-        </default>
-    </switch>
-</merge>
diff --git a/java/res/xml/rowkeys_hindi2.xml b/java/res/xml/rowkeys_hindi2.xml
deleted file mode 100644
index 57f9d5cd5..000000000
--- a/java/res/xml/rowkeys_hindi2.xml
+++ /dev/null
@@ -1,131 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <switch>
-        <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
-            <!-- U+0913: "ओ" DEVANAGARI LETTER O
-                 U+0913/U+0902: "ओं" DEVANAGARI LETTER O/DEVANAGARI SIGN ANUSVARA
-                 U+0911: "ऑ" DEVANAGARI LETTER CANDRA O
-                 U+0912: "ऒ" DEVANAGARI LETTER SHORT O -->
-            <Key
-                latin:keySpec="&#x0913;"
-                latin:moreKeys="&#x0913;&#x0902;,&#x0911;,&#x0912;" />
-            <!-- U+090F: "ए" DEVANAGARI LETTER E
-                 U+090F/U+0902: "एं" DEVANAGARI LETTER E/DEVANAGARI SIGN ANUSVARA
-                 U+090F/U+0901: "एँ" DEVANAGARI LETTER E/DEVANAGARI SIGN CANDRABINDU
-                 U+090D: "ऍ" DEVANAGARI LETTER CANDRA E
-                 U+090E: "ऎ" DEVANAGARI LETTER SHORT E -->
-            <Key
-                latin:keySpec="&#x090F;"
-                latin:moreKeys="&#x090F;&#x0902;,&#x090F;&#x0901;,&#x090D;,&#x090E;" />
-            <!-- U+0905: "अ" DEVANAGARI LETTER A
-                 U+0905/U+0902: "अं" DEVANAGARI LETTER A/DEVANAGARI SIGN ANUSVARA
-                 U+0905/U+0901: "अँ" DEVANAGARI LETTER A/DEVANAGARI SIGN CANDRABINDU -->
-            <Key
-                latin:keySpec="&#x0905;"
-                latin:moreKeys="&#x0905;&#x0902;,&#x0905;&#x0901;" />
-            <!-- U+0907: "इ" DEVANAGARI LETTER I
-                 U+0907/U+0902: "इं" DEVANAGARI LETTER I/DEVANAGARI SIGN ANUSVARA
-                 U+0907/U+0901: "इं" DEVANAGARI LETTER I/DEVANAGARI SIGN CANDRABINDU -->
-            <Key
-                latin:keySpec="&#x0907;"
-                latin:moreKeys="&#x0907;&#x0902;,&#x0907;&#x0901;" />
-            <!-- U+0909: "उ" DEVANAGARI LETTER U
-                 U+0909/U+0902: "उं" DEVANAGARI LETTER U/DEVANAGARI SIGN ANUSVARA
-                 U+0909/U+0901: "उँ" DEVANAGARI LETTER U/DEVANAGARI SIGN CANDRABINDU -->
-            <Key
-                latin:keySpec="&#x0909;"
-                latin:moreKeys="&#x0909;&#x0902;,&#x0909;&#x0901;" />
-            <!-- U+092B: "फ" DEVANAGARI LETTER PHA
-                 U+092B/U+093C: "फ़" DEVANAGARI LETTER PHA/DEVANAGARI SIGN NUKTA -->
-            <Key
-                latin:keySpec="&#x092B;"
-                latin:moreKeys="&#x092B;&#x093C;" />
-            <!-- U+0931: "ऱ" DEVANAGARI LETTER RRA
-                 U+094D/U+0930: "्र" DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER RA
-                 U+0930/U+094D: "र्" DEVANAGARI LETTER RA/DEVANAGARI SIGN VIRAMA -->
-            <Key
-                latin:keySpec="&#x0931;"
-                latin:moreKeys="&#x094D;&#x0930;,&#x0930;&#x094D;" />
-            <!-- U+0916: "ख" DEVANAGARI LETTER KHA
-                 U+0916/U+093C: "ख़" DEVANAGARI LETTER KHA/DEVANAGARI SIGN NUKTA -->
-            <Key
-                latin:keySpec="&#x0916;"
-                latin:moreKeys="&#x0916;&#x093C;" />
-            <!-- U+0925: "थ" DEVANAGARI LETTER THA -->
-            <Key latin:keySpec="&#x0925;" />
-            <!-- U+091B: "छ" DEVANAGARI LETTER CHA -->
-            <Key latin:keySpec="&#x091B;" />
-            <!-- U+0920: "ठ" DEVANAGARI LETTER TTHA -->
-            <Key latin:keySpec="&#x0920;" />
-        </case>
-        <default>
-            <!-- Because the font rendering system prior to API version 16 can't automatically
-                 render dotted circle for incomplete combining letter of some scripts, different
-                 set of Key definitions are needed based on the API version. -->
-            <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_o" />
-            <Key latin:keyStyle="baseKeyDevanagariVowelSignO" />
-            <!-- Because the font rendering system prior to API version 16 can't automatically
-                 render dotted circle for incomplete combining letter of some scripts, different
-                 set of Key definitions are needed based on the API version. -->
-            <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_e" />
-            <Key latin:keyStyle="baseKeyDevanagariVowelSignE" />
-            <!-- Because the font rendering system prior to API version 16 can't automatically
-                 render dotted circle for incomplete combining letter of some scripts, different
-                 set of Key definitions are needed based on the API version. -->
-            <include latin:keyboardLayout="@xml/keystyle_devanagari_sign_virama" />
-            <Key latin:keyStyle="baseKeyDevanagariSignVirama" />
-            <!-- Because the font rendering system prior to API version 16 can't automatically
-                 render dotted circle for incomplete combining letter of some scripts, different
-                 set of Key definitions are needed based on the API version. -->
-            <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_i" />
-            <Key latin:keyStyle="baseKeyDevanagariVowelSignI" />
-            <!-- Because the font rendering system prior to API version 16 can't automatically
-                 render dotted circle for incomplete combining letter of some scripts, different
-                 set of Key definitions are needed based on the API version. -->
-            <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_u" />
-            <Key latin:keyStyle="baseKeyDevanagariVowelSignU" />
-            <!-- U+092A: "प" DEVANAGARI LETTER PA -->
-            <Key latin:keySpec="&#x092A;" />
-            <!-- U+0930: "र" DEVANAGARI LETTER RA
-                 U+090B: "ऋ" DEVANAGARI LETTER VOCALIC R
-                 U+0930/U+093C: "ऱ" DEVANAGARI LETTER RA/DEVANAGARI SIGN NUKTA
-                 U+0960: "ॠ" DEVANAGARI LETTER VOCALIC RR -->
-            <Key
-                latin:keySpec="&#x0930;"
-                latin:moreKeys="&#x090B;,&#x0930;&#x093C;,&#x0960;" />
-            <!-- U+0915: "क" DEVANAGARI LETTER KA
-                 U+0915/U+093C: "क़" DEVANAGARI LETTER KA/DEVANAGARI SIGN NUKTA -->
-            <Key
-                latin:keySpec="&#x0915;"
-                latin:moreKeys="&#x0915;&#x093C;" />
-            <!-- U+0924: "त" DEVANAGARI LETTER TA
-                 U+0924/U+094D/U+0930: "त्र" DEVANAGARI LETTER TA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER RA -->
-            <Key
-                latin:keySpec="&#x0924;"
-                latin:moreKeys="&#x0924;&#x094D;&#x0930;" />
-            <!-- U+091A: "च" DEVANAGARI LETTER CA -->
-            <Key latin:keySpec="&#x091A;" />
-            <!-- U+091F: "ट" DEVANAGARI LETTER TTA -->
-            <Key latin:keySpec="&#x091F;" />
-        </default>
-    </switch>
-</merge>
diff --git a/java/res/xml/rowkeys_hindi3.xml b/java/res/xml/rowkeys_hindi3.xml
deleted file mode 100644
index 016930a5a..000000000
--- a/java/res/xml/rowkeys_hindi3.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <switch>
-        <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
-            <!-- U+0911: "ऑ" DEVANAGARI LETTER CANDRA O -->
-            <Key latin:keySpec="&#x0911;" />
-            <!-- Because the font rendering system prior to API version 16 can't automatically
-                 render dotted circle for incomplete combining letter of some scripts, different
-                 set of Key definitions are needed based on the API version. -->
-            <include latin:keyboardLayout="@xml/keystyle_devanagari_sign_candrabindu" />
-            <Key latin:keyStyle="baseKeyDevanagariSignCandrabindu" />
-            <!-- U+0923: "ण" DEVANAGARI LETTER NNA -->
-            <Key latin:keySpec="&#x0923;" />
-            <!-- U+0929: "ऩ" DEVANAGARI LETTER NNNA -->
-            <Key latin:keySpec="&#x0929;" />
-            <!-- U+0933: "ळ" DEVANAGARI LETTER LLA
-                 U+0934: "ऴ" DEVANAGARI LETTER LLLA -->
-            <Key
-                latin:keySpec="&#x0933;"
-                latin:moreKeys="&#x0934;" />
-            <!-- U+0936: "श" DEVANAGARI LETTER SHA -->
-            <Key latin:keySpec="&#x0936;" />
-            <!-- U+0937: "ष" DEVANAGARI LETTER SSA -->
-            <Key latin:keySpec="&#x0937;" />
-            <!-- Because the font rendering system prior to API version 16 can't automatically
-                 render dotted circle for incomplete combining letter of some scripts, different
-                 set of Key definitions are needed based on the API version. -->
-            <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_vocalic_r" />
-            <Key latin:keyStyle="baseKeyDevanagariVowelSignVocalicR" />
-            <!-- U+091E: "ञ" DEVANAGARI LETTER NYA -->
-            <Key latin:keySpec="&#x091E;" />
-        </case>
-        <default>
-            <!-- Because the font rendering system prior to API version 16 can't automatically
-                 render dotted circle for incomplete combining letter of some scripts, different
-                 set of Key definitions are needed based on the API version. -->
-            <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_candra_o" />
-            <Key latin:keyStyle="baseKeyDevanagariVowelSignCandraO" />
-            <!-- Because the font rendering system prior to API version 16 can't automatically
-                 render dotted circle for incomplete combining letter of some scripts, different
-                 set of Key definitions are needed based on the API version. -->
-            <include latin:keyboardLayout="@xml/keystyle_devanagari_sign_anusvara" />
-            <Key latin:keyStyle="baseKeyDevanagariSignAnusvara" />
-            <!-- U+092E: "म" DEVANAGARI LETTER MA
-                 U+0950: "ॐ" DEVANAGARI OM -->
-            <Key
-                latin:keySpec="&#x092E;"
-                latin:moreKeys="&#x0950;" />
-            <!-- U+0928: "न" DEVANAGARI LETTER NA
-                 U+091E: "ञ" DEVANAGARI LETTER NYA
-                 U+0919: "ङ" DEVANAGARI LETTER NGA
-                 U+0928/U+093C: "ऩ" DEVANAGARI LETTER NA/DEVANAGARI SIGN NUKTA -->
-            <Key
-                latin:keySpec="&#x0928;"
-                latin:moreKeys="&#x091E;,&#x0919;,&#x0928;&#x093C;" />
-            <!-- U+0935: "व" DEVANAGARI LETTER VA -->
-            <Key latin:keySpec="&#x0935;" />
-            <!-- U+0932: "ल" DEVANAGARI LETTER LA
-                 U+090C: "ऌ" DEVANAGARI LETTER VOCALIC L
-                 U+0961: "ॡ" DEVANAGARI LETTER VOCALIC LL -->
-            <Key
-                latin:keySpec="&#x0932;"
-                latin:moreKeys="&#x090C;,&#x0961;" />
-            <!-- U+0938: "स" DEVANAGARI LETTER SA -->
-            <Key latin:keySpec="&#x0938;" />
-            <!-- U+092F: "य" DEVANAGARI LETTER YA
-                 U+095F: "य़" DEVANAGARI LETTER YYA -->
-            <Key
-                latin:keySpec="&#x092F;"
-                latin:moreKeys="&#x095F;" />
-            <!-- Because the font rendering system prior to API version 16 can't automatically
-                 render dotted circle for incomplete combining letter of some scripts, different
-                 set of Key definitions are needed based on the API version. -->
-            <include latin:keyboardLayout="@xml/keystyle_devanagari_sign_nukta" />
-            <Key latin:keyStyle="baseKeyDevanagariSignNukta" />
-        </default>
-    </switch>
-</merge>
diff --git a/java/res/xml/rowkeys_hindi_compact1.xml b/java/res/xml/rowkeys_hindi_compact1.xml
deleted file mode 100644
index a8235df92..000000000
--- a/java/res/xml/rowkeys_hindi_compact1.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2014, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <!-- Because the font rendering system prior to API version 16 can't automatically
-         render dotted circle for incomplete combining letter of some scripts, different
-         set of Key definitions are needed based on the API version. -->
-    <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_au" />
-    <!-- U+0914: "औ" DEVANAGARI LETTER AU
-         U+0967: "१" DEVANAGARI DIGIT ONE -->
-    <Key
-        latin:keySpec="&#x0914;"
-        latin:keyStyle="moreKeysDevanagariVowelSignAu"
-        latin:keyHintLabel="1"
-        latin:additionalMoreKeys="&#x0967;,1" />
-    <!-- Because the font rendering system prior to API version 16 can't automatically
-         render dotted circle for incomplete combining letter of some scripts, different
-         set of Key definitions are needed based on the API version. -->
-    <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_ai" />
-    <!-- U+0910: "ऐ" DEVANAGARI LETTER AI
-         U+0968: "२" DEVANAGARI DIGIT TWO -->
-    <Key
-        latin:keySpec="&#x0910;"
-        latin:keyStyle="moreKeysDevanagariVowelSignAi"
-        latin:keyHintLabel="2"
-        latin:additionalMoreKeys="&#x0968;,2" />
-    <!-- Because the font rendering system prior to API version 16 can't automatically
-         render dotted circle for incomplete combining letter of some scripts, different
-         set of Key definitions are needed based on the API version. -->
-    <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_aa" />
-    <!-- U+0906: "आ" DEVANAGARI LETTER AA
-         U+0969: "३" DEVANAGARI DIGIT THREE -->
-    <Key
-        latin:keySpec="&#x0906;"
-        latin:keyStyle="moreKeysDevanagariVowelSignAa"
-        latin:keyHintLabel="3"
-        latin:additionalMoreKeys="&#x0969;,3" />
-    <!-- Because the font rendering system prior to API version 16 can't automatically
-         render dotted circle for incomplete combining letter of some scripts, different
-         set of Key definitions are needed based on the API version. -->
-    <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_ii" />
-    <!-- U+0908: "ई" DEVANAGARI LETTER II
-         U+096A: "४" DEVANAGARI DIGIT FOUR -->
-    <Key
-        latin:keySpec="&#x0908;"
-        latin:keyStyle="moreKeysDevanagariVowelSignIi"
-        latin:keyHintLabel="4"
-        latin:additionalMoreKeys="&#x096A;,4" />
-    <!-- Because the font rendering system prior to API version 16 can't automatically
-         render dotted circle for incomplete combining letter of some scripts, different
-         set of Key definitions are needed based on the API version. -->
-    <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_uu" />
-    <!-- U+090A: "ऊ" DEVANAGARI LETTER UU
-         U+096B: "५" DEVANAGARI DIGIT FIVE -->
-    <Key
-        latin:keySpec="&#x090A;"
-        latin:keyStyle="moreKeysDevanagariVowelSignUu"
-        latin:keyHintLabel="5"
-        latin:additionalMoreKeys="&#x096B;,5" />
-    <!-- U+092C: "ब" DEVANAGARI LETTER BA
-         U+092D: "भ" DEVANAGARI LETTER BHA
-         U+096C: "६" DEVANAGARI DIGIT SIX -->
-    <Key
-        latin:keySpec="&#x092C;"
-        latin:moreKeys="&#x092D;,%"
-        latin:keyHintLabel="6"
-        latin:additionalMoreKeys="&#x096C;,6" />
-    <!-- U+0939: "ह" DEVANAGARI LETTER HA
-         U+096D: "७" DEVANAGARI DIGIT SEVEN -->
-    <Key
-        latin:keySpec="&#x0939;"
-        latin:keyHintLabel="7"
-        latin:additionalMoreKeys="&#x096D;,7" />
-    <!-- U+0917: "ग" DEVANAGARI LETTER GA
-         U+0918: "घ" DEVANAGARI LETTER GHA
-         U+096E: "८" DEVANAGARI DIGIT EIGHT -->
-    <Key
-        latin:keySpec="&#x0917;"
-        latin:moreKeys="&#x0918;,%"
-        latin:keyHintLabel="8"
-        latin:additionalMoreKeys="&#x096E;,8" />
-    <!-- U+0926: "द" DEVANAGARI LETTER DA
-         U+0927: "ध" DEVANAGARI LETTER DHA
-         U+096F: "९" DEVANAGARI DIGIT NINE -->
-    <Key
-        latin:keySpec="&#x0926;"
-        latin:moreKeys="&#x0927;,%"
-        latin:keyHintLabel="9"
-        latin:additionalMoreKeys="&#x096F;,9" />
-    <!-- U+091C: "ज" DEVANAGARI LETTER JA
-         U+091D: "झ" DEVANAGARI LETTER JHA
-         U+091C/U+094D/U+091E: "ज्ञ" DEVANAGARI LETTER JA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER NYA
-         U+0966: "०" DEVANAGARI DIGIT ZERO -->
-    <Key
-        latin:keySpec="&#x091C;"
-        latin:moreKeys="&#x091D;,&#x091C;&#x094D;&#x091E;,%"
-        latin:keyHintLabel="0"
-        latin:additionalMoreKeys="&#x0966;,0" />
-    <!-- U+0921: "ड" DEVANAGARI LETTER DDA
-         U+0922: "ढ" DEVANAGARI LETTER DDHA -->
-    <Key
-        latin:keySpec="&#x0921;"
-        latin:moreKeys="&#x0922;" />
-</merge>
diff --git a/java/res/xml/rowkeys_hindi_compact2.xml b/java/res/xml/rowkeys_hindi_compact2.xml
deleted file mode 100644
index 9d7d795fb..000000000
--- a/java/res/xml/rowkeys_hindi_compact2.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2014, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <!-- Because the font rendering system prior to API version 16 can't automatically
-         render dotted circle for incomplete combining letter of some scripts, different
-         set of Key definitions are needed based on the API version. -->
-    <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_o" />
-    <!-- U+0913: "ओ" DEVANAGARI LETTER O -->
-    <Key
-        latin:keySpec="&#x0913;"
-        latin:keyStyle="moreKeysDevanagariVowelSignO" />
-    <!-- Because the font rendering system prior to API version 16 can't automatically
-         render dotted circle for incomplete combining letter of some scripts, different
-         set of Key definitions are needed based on the API version. -->
-    <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_e" />
-    <!-- U+090F: "ए" DEVANAGARI LETTER E -->
-    <Key
-        latin:keySpec="&#x090F;"
-        latin:keyStyle="moreKeysDevanagariVowelSignE" />
-    <!-- Because the font rendering system prior to API version 16 can't automatically
-         render dotted circle for incomplete combining letter of some scripts, different
-         set of Key definitions are needed based on the API version. -->
-    <include latin:keyboardLayout="@xml/keystyle_devanagari_sign_virama" />
-    <!-- U+0905: "अ" DEVANAGARI LETTER A -->
-    <Key
-        latin:keySpec="&#x0905;"
-        latin:keyStyle="moreKeySpecDevanagariSignVirama" />
-    <!-- Because the font rendering system prior to API version 16 can't automatically
-         render dotted circle for incomplete combining letter of some scripts, different
-         set of Key definitions are needed based on the API version. -->
-    <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_i" />
-    <!-- U+0907: "इ" DEVANAGARI LETTER I -->
-    <Key
-        latin:keySpec="&#x0907;"
-        latin:keyStyle="moreKeysDevanagariVowelSignI" />
-    <!-- Because the font rendering system prior to API version 16 can't automatically
-         render dotted circle for incomplete combining letter of some scripts, different
-         set of Key definitions are needed based on the API version. -->
-    <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_u" />
-    <!-- U+0909: "उ" DEVANAGARI LETTER U -->
-    <Key
-        latin:keySpec="&#x0909;"
-        latin:keyStyle="moreKeysDevanagariVowelSignU" />
-    <!-- U+092A: "प" DEVANAGARI LETTER PA
-         U+092B: "फ" DEVANAGARI LETTER PHA -->
-    <Key
-        latin:keySpec="&#x092A;"
-        latin:moreKeys="&#x092B;" />
-    <!-- Because the font rendering system prior to API version 16 can't automatically
-         render dotted circle for incomplete combining letter of some scripts, different
-         set of Key definitions are needed based on the API version. -->
-    <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_vocalic_r" />
-    <!-- U+0930: "र" DEVANAGARI LETTER RA -->
-    <Key
-        latin:keySpec="&#x0930;"
-        latin:keyStyle="moreKeysDevanagariVowelSignVocalicR" />
-    <!-- U+0915: "क" DEVANAGARI LETTER KA
-         U+0916: "ख" DEVANAGARI LETTER KHA -->
-    <Key
-        latin:keySpec="&#x0915;"
-        latin:moreKeys="&#x0916;" />
-    <!-- U+0924: "त" DEVANAGARI LETTER TA
-         U+0925: "थ" DEVANAGARI LETTER THA
-         U+0924/U+094D/U+0930: "त्र" DEVANAGARI LETTER TA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER RA -->
-    <Key
-        latin:keySpec="&#x0924;"
-        latin:moreKeys="&#x0925;,&#x0924;&#x094D;&#x0930;" />
-    <!-- U+091A: "च" DEVANAGARI LETTER CA
-         U+091B: "छ" DEVANAGARI LETTER CHA -->
-    <Key
-        latin:keySpec="&#x091A;"
-        latin:moreKeys="&#x091B;" />
-    <!-- U+091F: "ट" DEVANAGARI LETTER TTA
-         U+0920: "ठ" DEVANAGARI LETTER TTHA -->
-    <Key
-        latin:keySpec="&#x091F;"
-        latin:moreKeys="&#x0920;" />
-</merge>
diff --git a/java/res/xml/rowkeys_hindi_compact3.xml b/java/res/xml/rowkeys_hindi_compact3.xml
deleted file mode 100644
index 41b480812..000000000
--- a/java/res/xml/rowkeys_hindi_compact3.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2014, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <!-- Because the font rendering system prior to API version 16 can't automatically
-         render dotted circle for incomplete combining letter of some scripts, different
-         set of Key definitions are needed based on the API version. -->
-    <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_candra_o" />
-    <!-- U+0911: "ऑ" DEVANAGARI LETTER CANDRA O -->
-    <Key
-        latin:keySpec="&#x0911;"
-        latin:keyStyle="moreKeysDevanagariVowelSignCandraO" />
-    <!-- Because the font rendering system prior to API version 16 can't automatically
-         render dotted circle for incomplete combining letter of some scripts, different
-         set of Key definitions are needed based on the API version. -->
-    <include latin:keyboardLayout="@xml/keystyle_devanagari_sign_virama" />
-    <Key latin:keyStyle="baseKeyDevanagariSignVirama" />
-    <!-- Because the font rendering system prior to API version 16 can't automatically
-         render dotted circle for incomplete combining letter of some scripts, different
-         set of Key definitions are needed based on the API version. -->
-    <include latin:keyboardLayout="@xml/keystyle_devanagari_sign_anusvara" />
-    <Key latin:keyStyle="baseKeyDevanagariSignAnusvara" />
-    <!-- U+092E: "म" DEVANAGARI LETTER MA
-         U+0950: "ॐ" DEVANAGARI OM -->
-    <Key
-        latin:keySpec="&#x092E;"
-        latin:moreKeys="&#x0950;" />
-    <!-- U+0928: "न" DEVANAGARI LETTER NA
-         U+0923: "ण" DEVANAGARI LETTER NNA
-         U+091E: "ञ" DEVANAGARI LETTER NYA
-         U+0919: "ङ" DEVANAGARI LETTER NGA -->
-    <Key
-        latin:keySpec="&#x0928;"
-        latin:moreKeys="&#x0923;,&#x091E;,&#x0919;" />
-    <!-- U+0935: "व" DEVANAGARI LETTER VA -->
-    <Key latin:keySpec="&#x0935;" />
-    <!-- U+0932: "ल" DEVANAGARI LETTER LA -->
-    <Key latin:keySpec="&#x0932;" />
-    <!-- U+0938: "स" DEVANAGARI LETTER SA
-         U+0936: "श" DEVANAGARI LETTER SHA
-         U+0937: "ष" DEVANAGARI LETTER SSA
-         U+0936/U+094D/U+0930: "श्र" DEVANAGARI LETTER SHA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER RA -->
-    <Key
-        latin:keySpec="&#x0938;"
-        latin:moreKeys="&#x0936;,&#x0937;,&#x0936;&#x094D;&#x0930;" />
-    <!-- U+092F: "य" DEVANAGARI LETTER YA -->
-    <Key latin:keySpec="&#x092F;" />
-    <!-- U+0915/U+094D/U+0937: "क्ष" DEVANAGARI LETTER KA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER SSA -->
-    <Key
-        latin:keySpec="&#x0915;&#x094D;&#x0937;"
-        latin:keyLabelFlags="followKeyLetterRatio" />
-</merge>
diff --git a/java/res/xml/rowkeys_kannada1.xml b/java/res/xml/rowkeys_kannada1.xml
deleted file mode 100644
index d3f825cbc..000000000
--- a/java/res/xml/rowkeys_kannada1.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2014, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <!-- U+0CCC: "ೌ" KANNADA VOWEL SIGN AU
-         U+0C94: "ಔ" KANNADA LETTER AU
-         U+0CE7: "೧" KANNADA DIGIT ONE -->
-    <Key
-        latin:keySpec="&#x0CCC;"
-        latin:moreKeys="&#x0C94;,&#x0CE7;,%"
-        latin:keyHintLabel="1"
-        latin:additionalMoreKeys="1" />
-    <!-- U+0CC8: "ೈ" KANNADA VOWEL SIGN AI
-         U+0C90: "ಐ" KANNADA LETTER AI
-         U+0CE8: "೨" KANNADA DIGIT TWO -->
-    <Key
-        latin:keySpec="&#x0CC8;"
-        latin:moreKeys="&#x0C90;,&#x0CE8;,%"
-        latin:keyHintLabel="2"
-        latin:additionalMoreKeys="2" />
-    <!-- U+0CBE: "ಾ" KANNADA VOWEL SIGN AA
-         U+0C86: "ಆ" KANNADA LETTER AA
-         U+0CE9: "೩" KANNADA DIGIT THREE -->
-    <Key
-        latin:keySpec="&#x0CBE;"
-        latin:moreKeys="&#x0C86;,&#x0CE9;,%"
-        latin:keyHintLabel="3"
-        latin:additionalMoreKeys="3" />
-    <!-- U+0CC0: "ೀ" KANNADA VOWEL SIGN II
-         U+0C88: "ಈ" KANNADA LETTER II
-         U+0CEA: "೪" KANNADA DIGIT FOUR -->
-    <Key
-        latin:keySpec="&#x0CC0;"
-        latin:moreKeys="&#x0C88;,&#x0CEA;,%"
-        latin:keyHintLabel="4"
-        latin:additionalMoreKeys="4" />
-    <!-- U+0CC2: "ೂ" KANNADA VOWEL SIGN UU
-         U+0C8A: "ಊ" KANNADA LETTER UU
-         U+0CEB: "೫" KANNADA DIGIT FIVE -->
-    <Key
-        latin:keySpec="&#x0CC2;"
-        latin:moreKeys="&#x0C8A;,&#x0CEB;,%"
-        latin:keyHintLabel="5"
-        latin:additionalMoreKeys="5" />
-    <!-- U+0CAC: "ಬ" KANNADA LETTER BA
-         U+0CAD: "ಭ" KANNADA LETTER BHA
-         U+0CEC: "೬" KANNADA DIGIT SIX -->
-    <Key
-        latin:keySpec="&#x0CAC;"
-        latin:moreKeys="&#x0CAD;,&#x0CEC;,%"
-        latin:keyHintLabel="6"
-        latin:additionalMoreKeys="6" />
-    <!-- U+0CB9: "ಹ" KANNADA LETTER HA
-         U+0C99: "ಙ" KANNADA LETTER NGA
-         U+0CED: "೭" KANNADA DIGIT SEVEN -->
-    <Key
-        latin:keySpec="&#x0CB9;"
-        latin:moreKeys="&#x0C99;,&#x0CED;,%"
-        latin:keyHintLabel="7"
-        latin:additionalMoreKeys="7" />
-    <!-- U+0C97: "ಗ" KANNADA LETTER GA
-         U+0C98: "ಘ" KANNADA LETTER GHA
-         U+0CEE: "೮" KANNADA DIGIT EIGHT -->
-    <Key
-        latin:keySpec="&#x0C97;"
-        latin:moreKeys="&#x0C98;,&#x0CEE;,%"
-        latin:keyHintLabel="8"
-        latin:additionalMoreKeys="8" />
-    <!-- U+0CA6: "ದ" KANNADA LETTER DA
-         U+0CA7: "ಧ" KANNADA LETTER DHA
-         U+0CEF: "೯" KANNADA DIGIT NINE -->
-    <Key
-        latin:keySpec="&#x0CA6;"
-        latin:moreKeys="&#x0CA7;,&#x0CEF;,%"
-        latin:keyHintLabel="9"
-        latin:additionalMoreKeys="9" />
-    <!-- U+0C9C: "ಜ" KANNADA LETTER JA
-         U+0C9D: "ಝ" KANNADA LETTER JHA
-         U+0CE6: "೦" KANNADA DIGIT ZERO -->
-    <Key
-        latin:keySpec="&#x0C9C;"
-        latin:moreKeys="&#x0C9D;,&#x0CE6;,%"
-        latin:keyHintLabel="0"
-        latin:additionalMoreKeys="0" />
-    <!-- U+0CA1: "ಡ" KANNADA LETTER DDA
-         U+0CA2: "ಢ" KANNADA LETTER DDHA -->
-    <Key
-        latin:keySpec="&#x0CA1;"
-        latin:moreKeys="&#x0CA2;" />
-</merge>
diff --git a/java/res/xml/rowkeys_kannada2.xml b/java/res/xml/rowkeys_kannada2.xml
deleted file mode 100644
index 89d2cfc14..000000000
--- a/java/res/xml/rowkeys_kannada2.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2014, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <!-- U+0CCB: "ೋ" KANNADA VOWEL SIGN OO
-         U+0C93: "ಓ" KANNADA LETTER OO -->
-    <Key
-        latin:keySpec="&#x0CCB;"
-        latin:moreKeys="&#x0C93;" />
-    <!-- U+0CC7: "ೇ" KANNADA VOWEL SIGN EE
-         U+0C8F: "ಏ" KANNADA LETTER EE -->
-    <Key
-        latin:keySpec="&#x0CC7;"
-        latin:moreKeys="&#x0C8F;" />
-    <!-- U+0CCD: "್" KANNADA SIGN VIRAMA
-         U+0C85: "ಅ" KANNADA LETTER A -->
-    <Key
-        latin:keySpec="&#x0CCD;"
-        latin:moreKeys="&#x0C85;" />
-    <!-- U+0CBF: "ಿ" KANNADA VOWEL SIGN I
-         U+0C87: "ಇ" KANNADA LETTER I -->
-    <Key
-        latin:keySpec="&#x0CBF;"
-        latin:moreKeys="&#x0C87;" />
-    <!-- U+0CC1: "ು" KANNADA VOWEL SIGN U
-         U+0C89: "ಉ" KANNADA LETTER U -->
-    <Key
-        latin:keySpec="&#x0CC1;"
-        latin:moreKeys="&#x0C89;" />
-    <!-- U+0CAA: "ಪ" KANNADA LETTER PA
-         U+0CAB: "ಫ" KANNADA LETTER PHA -->
-    <Key
-        latin:keySpec="&#x0CAA;"
-        latin:moreKeys="&#x0CAB;" />
-    <!-- U+0CB0: "ರ" KANNADA LETTER RA
-         U+0CB1: "ಱ" KANNADA LETTER RRA
-         U+0CC3: "ೃ" KANNADA VOWEL SIGN VOCALIC R -->
-    <Key
-        latin:keySpec="&#x0CB0;"
-        latin:moreKeys="&#x0CB1;,&#x0CC3;" />
-    <!-- U+0C95: "ಕ" KANNADA LETTER KA
-         U+0C96: "ಖ" KANNADA LETTER KHA -->
-    <Key
-        latin:keySpec="&#x0C95;"
-        latin:moreKeys="&#x0C96;" />
-    <!-- U+0CA4: "ತ" KANNADA LETTER TA
-         U+0CA5: "ಥ" KANNADA LETTER THA -->
-    <Key
-        latin:keySpec="&#x0CA4;"
-        latin:moreKeys="&#x0CA5;" />
-    <!-- U+0C9A: "ಚ" KANNADA LETTER CA
-         U+0C9B: "ಛ" KANNADA LETTER CHA -->
-    <Key
-        latin:keySpec="&#x0C9A;"
-        latin:moreKeys="&#x0C9B;" />
-    <!-- U+0C9F: "ಟ" KANNADA LETTER TTA
-         U+0CA0: "ಠ" KANNADA LETTER TTHA -->
-    <Key
-        latin:keySpec="&#x0C9F;"
-        latin:moreKeys="&#x0CA0;" />
-</merge>
diff --git a/java/res/xml/rowkeys_kannada3.xml b/java/res/xml/rowkeys_kannada3.xml
deleted file mode 100644
index 8cdaa256b..000000000
--- a/java/res/xml/rowkeys_kannada3.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2014, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <!-- U+0CC6: "ೆ" KANNADA VOWEL SIGN E
-         U+0C92: "ಒ" KANNADA LETTER O -->
-    <Key
-        latin:keySpec="&#x0CC6;"
-        latin:moreKeys="&#x0C92;" />
-    <!-- U+0C82: "ಂ" KANNADA SIGN ANUSVARA
-         U+0C8E: "ಎ" KANNADA LETTER E -->
-    <Key
-        latin:keySpec="&#x0C82;"
-        latin:moreKeys="&#x0C8E;" />
-    <!-- U+0CAE: "ಮ" KANNADA LETTER MA -->
-    <Key latin:keySpec="&#x0CAE;" />
-    <!-- U+0CA8: "ನ" KANNADA LETTER NA
-         U+0CA3: "ಣ" KANNADA LETTER NNA -->
-    <Key latin:keySpec="&#x0CA8;"
-        latin:moreKeys="&#x0CA3;" />
-    <!-- U+0CB5: "ವ" KANNADA LETTER VA -->
-    <Key latin:keySpec="&#x0CB5;" />
-    <!-- U+0CB2: "ಲ" KANNADA LETTER LA
-         U+0CB3: "ಳ" KANNADA LETTER LLA -->
-    <Key
-        latin:keySpec="&#x0CB2;"
-        latin:moreKeys="&#x0CB3;" />
-    <!-- U+0CB8: "ಸ" KANNADA LETTER SA
-         U+0CB6: "ಶ" KANNADA LETTER SHA -->
-    <Key
-        latin:keySpec="&#x0CB8;"
-        latin:moreKeys="&#x0CB6;" />
-    <!-- U+0C8B: "ಋ" KANNADA LETTER VOCALIC R
-         U+0CCD/U+0CB0: "್ರ" KANNADA SIGN VIRAMA/KANNADA LETTER RA -->
-    <Key
-        latin:keySpec="&#x0C8B;"
-        latin:moreKeys="&#x0CCD;&#x0CB0;" />
-    <!-- U+0CB7: "ಷ" KANNADA LETTER SSA
-         U+0C95/U+0CCD/U+0CB7: "ಕ್ಷ" KANNADA LETTER RA/KANNADA SIGN VIRAMA/KANNADA LETTER SSA -->
-    <Key
-        latin:keySpec="&#x0CB7;"
-        latin:moreKeys="&#x0C95;&#x0CCD;&#x0CB7;" />
-    <!-- U+0CAF: "ಯ" KANNADA LETTER YA
-         U+0C9C/U+0CCD/U+0C9E: "ಜ್ಞ" KANNADA LETTER JA/KANNADA SIGN VIRAMA/KANNADA LETTER NYA -->
-    <Key
-        latin:keySpec="&#x0CAF;"
-        latin:moreKeys="&#x0C9C;&#x0CCD;&#x0C9E;" />
-</merge>
diff --git a/java/res/xml/rowkeys_khmer1.xml b/java/res/xml/rowkeys_khmer1.xml
deleted file mode 100644
index c70b74814..000000000
--- a/java/res/xml/rowkeys_khmer1.xml
+++ /dev/null
@@ -1,176 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2013, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <switch>
-        <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
-            <!-- U+200D: ZERO WIDTH JOINER -->
-            <Key
-                latin:keySpec="!"
-                latin:moreKeys="!icon/zwj_key|&#x200D;"
-                latin:keyLabelFlags="fontDefault" />
-            <!-- U+17D7: "ៗ" KHMER SIGN LEK TOO
-                 U+200C: ZERO WIDTH NON-JOINER -->
-            <Key
-                latin:keySpec="&#x17D7;"
-                latin:moreKeys="!icon/zwnj_key|&#x200C;" />
-            <!-- U+17D1: "៑" KHMER SIGN VIRIAM -->
-            <Key
-                latin:keySpec="&quot;"
-                latin:keyHintLabel="&#x17D1;"
-                latin:moreKeys="&#x17D1;"
-                latin:keyLabelFlags="fontDefault" />
-            <!-- U+17DB: "៛" KHMER CURRENCY SYMBOL RIEL
-                 U+20AC: "€" EURO SIGN -->
-            <Key
-                latin:keySpec="&#x17DB;"
-                latin:keyHintLabel="$"
-                latin:moreKeys="$,&#x20AC;" />
-            <!-- U+17D6: "៖" KHMER SIGN CAMNUC PII KUUH -->
-            <Key
-                latin:keySpec="%"
-                latin:keyHintLabel="&#x17D6;"
-                latin:moreKeys="&#x17D6;"
-                latin:keyLabelFlags="fontDefault" />
-            <!-- U+17CD: "៍" KHMER SIGN TOANDAKHIAT
-                 U+17D9: "៙" KHMER SIGN PHNAEK MUAN -->
-            <Key
-                latin:keySpec="&#x17CD;"
-                latin:keyHintLabel="&#x17D9;"
-                latin:moreKeys="&#x17D9;" />
-            <!-- U+17D0: "័" KHMER SIGN SAMYOK SANNYA
-                 U+17DA: "៚" KHMER SIGN KOOMUUT -->
-            <Key
-                latin:keySpec="&#x17D0;"
-                latin:keyHintLabel="&#x17DA;"
-                latin:keyHintLabelVerticalAdjustment="-30%"
-                latin:moreKeys="&#x17DA;" />
-            <!-- U+17CF: "៏" KHMER SIGN AHSDA -->
-            <Key
-                latin:keySpec="&#x17CF;"
-                latin:keyHintLabel="*"
-                latin:moreKeys="*" />
-            <!-- U+00AB: "«" LEFT-POINTING DOUBLE ANGLE QUOTATION MARK -->
-            <Key
-                latin:keySpec="("
-                latin:keyHintLabel="{"
-                latin:moreKeys="{,&#x00AB;"
-                latin:keyLabelFlags="fontDefault" />
-            <!-- U+00BB: "»" RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK -->
-            <Key
-                latin:keySpec=")"
-                latin:keyHintLabel="}"
-                latin:moreKeys="},&#x00BB;"
-                latin:keyLabelFlags="fontDefault" />
-            <!-- U+17CC: "៌" KHMER SIGN ROBAT
-                 U+00D7: "×" MULTIPLICATION SIGN -->
-            <Key
-                latin:keySpec="&#x17CC;"
-                latin:keyHintLabel="&#x00D7;"
-                latin:moreKeys="&#x00D7;" />
-            <!-- U+17CE: "៎" KHMER SIGN KAKABAT -->
-            <Key latin:keySpec="&#x17CE;" />
-        </case>
-        <default>
-            <!-- U+17E1: "១" KHMER DIGIT ONE
-                 U+17F1: "៱" KHMER SYMBOL LEK ATTAK MUOY -->
-            <Key
-                latin:keySpec="&#x17E1;"
-                latin:keyHintLabel="1"
-                latin:additionalMoreKeys="1"
-                latin:moreKeys="&#x17F1;" />
-            <!-- U+17E2: "២" KHMER DIGIT TWO
-                 U+17F2: "៲" KHMER SYMBOL LEK ATTAK PII -->
-            <Key
-                latin:keySpec="&#x17E2;"
-                latin:keyHintLabel="2"
-                latin:additionalMoreKeys="2"
-                latin:moreKeys="&#x17F2;" />
-            <!-- U+17E3: "៣" KHMER DIGIT THREE
-                 U+17F3: "៳" KHMER SYMBOL LEK ATTAK BEI -->
-            <Key
-                latin:keySpec="&#x17E3;"
-                latin:keyHintLabel="3"
-                latin:additionalMoreKeys="3"
-                latin:moreKeys="&#x17F3;" />
-            <!-- U+17E4: "៤" KHMER DIGIT FOUR
-                 U+17F4: "៴" KHMER SYMBOL LEK ATTAK BUON -->
-            <Key
-                latin:keySpec="&#x17E4;"
-                latin:keyHintLabel="4"
-                latin:additionalMoreKeys="4"
-                latin:moreKeys="&#x17F4;" />
-            <!-- U+17E5: "៥" KHMER DIGIT FIVE
-                 U+17F5: "៵" KHMER SYMBOL LEK ATTAK PRAM -->
-            <Key
-                latin:keySpec="&#x17E5;"
-                latin:keyHintLabel="5"
-                latin:additionalMoreKeys="5"
-                latin:moreKeys="&#x17F5;" />
-            <!-- U+17E6: "៦" KHMER DIGIT SIX
-                 U+17F6: "៶" KHMER SYMBOL LEK ATTAK PRAM-MUOY -->
-            <Key
-                latin:keySpec="&#x17E6;"
-                latin:keyHintLabel="6"
-                latin:additionalMoreKeys="6"
-                latin:moreKeys="&#x17F6;" />
-            <!-- U+17E7: "៧" KHMER DIGIT SEVEN
-                 U+17F7: "៷" KHMER SYMBOL LEK ATTAK PRAM-PII -->
-            <Key
-                latin:keySpec="&#x17E7;"
-                latin:keyHintLabel="7"
-                latin:additionalMoreKeys="7"
-                latin:moreKeys="&#x17F7;" />
-            <!-- U+17E8: "៨" KHMER DIGIT EIGHT
-                 U+17F8: "៸" KHMER SYMBOL LEK ATTAK PRAM-BEI -->
-            <Key
-                latin:keySpec="&#x17E8;"
-                latin:keyHintLabel="8"
-                latin:additionalMoreKeys="8"
-                latin:moreKeys="&#x17F8;" />
-            <!-- U+17E9: "៩" KHMER DIGIT NINE
-                 U+17F9: "៹" KHMER SYMBOL LEK ATTAK PRAM-BUON -->
-            <Key
-                latin:keySpec="&#x17E9;"
-                latin:keyHintLabel="9"
-                latin:additionalMoreKeys="9"
-                latin:moreKeys="&#x17F9;" />
-            <!-- U+17E0: "០" KHMER DIGIT ZERO
-                 U+17F0: "៰" KHMER SYMBOL LEK ATTAK SON -->
-            <Key
-                latin:keySpec="&#x17E0;"
-                latin:keyHintLabel="0"
-                latin:additionalMoreKeys="0"
-                latin:moreKeys="&#x17F0;" />
-            <!-- U+17A5: "ឥ" KHMER INDEPENDENT VOWEL QI
-                 U+17A6: "ឦ" KHMER INDEPENDENT VOWEL QII -->
-            <Key
-                latin:keySpec="&#x17A5;"
-                latin:keyHintLabel="&#x17A6;"
-                latin:moreKeys=",&#x17A6;" />
-            <!-- U+17B2: "ឲ" KHMER INDEPENDENT VOWEL QOO TYPE TWO
-                 U+17B1: "ឱ" KHMER INDEPENDENT VOWEL QOO TYPE ONE -->
-            <Key
-                latin:keySpec="&#x17B2;"
-                latin:keyHintLabel="&#x17B1;"
-                latin:moreKeys="&#x17B1;" />
-        </default>
-    </switch>
-</merge>
diff --git a/java/res/xml/rowkeys_khmer2.xml b/java/res/xml/rowkeys_khmer2.xml
deleted file mode 100644
index eb45c1faf..000000000
--- a/java/res/xml/rowkeys_khmer2.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2013, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <switch>
-        <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
-            <!-- U+1788: "ឈ" KHMER LETTER CHO
-                 U+17DC: "ៜ" KHMER SIGN AVAKRAHASANYA -->
-            <Key
-                latin:keySpec="&#x1788;"
-                latin:keyHintLabel="&#x17DC;"
-                latin:moreKeys="&#x17DC;" />
-            <!-- U+17BA: "ឺ" KHMER VOWEL SIGN YY
-                 U+17DD: "៝" KHMER SIGN ATTHACAN -->
-            <Key
-                latin:keySpec="&#x17BA;"
-                latin:keyHintLabel="&#x17DD;"
-                latin:keyHintLabelVerticalAdjustment="40%"
-                latin:moreKeys="&#x17DD;" />
-            <!-- U+17C2: "ែ" KHMER VOWEL SIGN AE -->
-            <Key latin:keySpec="&#x17C2;" />
-            <!-- U+17AC: "ឬ" KHMER INDEPENDENT VOWEL RYY
-                 U+17AB: "ឫ" KHMER INDEPENDENT VOWEL RY -->
-            <Key
-                latin:keySpec="&#x17AC;"
-                latin:keyHintLabel="&#x17AB;"
-                latin:moreKeys="&#x17AB;" />
-            <!-- U+1791: "ទ" KHMER LETTER TO -->
-            <Key latin:keySpec="&#x1791;" />
-            <!-- U+17BD: "ួ" KHMER VOWEL SIGN UA -->
-            <Key latin:keySpec="&#x17BD;" />
-            <!-- U+17BC: "ូ" KHMER VOWEL SIGN UU -->
-            <Key latin:keySpec="&#x17BC;" />
-            <!-- U+17B8: "ី" KHMER VOWEL SIGN II -->
-            <Key latin:keySpec="&#x17B8;" />
-            <!-- U+17C5: "ៅ" KHMER VOWEL SIGN AU -->
-            <Key latin:keySpec="&#x17C5;" />
-            <!-- U+1797: "ភ" KHMER LETTER PHO -->
-            <Key latin:keySpec="&#x1797;" />
-            <!-- U+17BF: "ឿ" KHMER VOWEL SIGN YA -->
-            <Key latin:keySpec="&#x17BF;" />
-            <!-- U+17B0: "ឰ" KHMER INDEPENDENT VOWEL QAI -->
-            <Key latin:keySpec="&#x17B0;" />
-        </case>
-        <default>
-            <!-- U+1786: "ឆ" KHMER LETTER CHA -->
-            <Key latin:keySpec="&#x1786;" />
-            <!-- U+17B9: "ឹ" KHMER VOWEL SIGN Y -->
-            <Key latin:keySpec="&#x17B9;" />
-            <!-- U+17C1: "េ" KHMER VOWEL SIGN E -->
-            <Key latin:keySpec="&#x17C1;" />
-            <!-- U+179A: "រ" KHMER LETTER RO -->
-            <Key latin:keySpec="&#x179A;" />
-            <!-- U+178F: "ត" KHMER LETTER TA -->
-            <Key latin:keySpec="&#x178F;" />
-            <!-- U+1799: "យ" KHMER LETTER YO -->
-            <Key latin:keySpec="&#x1799;" />
-            <!-- U+17BB: "ុ" KHMER VOWEL SIGN U -->
-            <Key latin:keySpec="&#x17BB;" />
-            <!-- U+17B7: "ិ" KHMER VOWEL SIGN I -->
-            <Key latin:keySpec="&#x17B7;" />
-            <!-- U+17C4: "ោ" KHMER VOWEL SIGN OO -->
-            <Key latin:keySpec="&#x17C4;" />
-            <!-- U+1795: "ផ" KHMER LETTER PHA -->
-            <Key latin:keySpec="&#x1795;" />
-            <!-- U+17C0: "ៀ" KHMER VOWEL SIGN IE -->
-            <Key latin:keySpec="&#x17C0;" />
-            <!-- U+17AA: "ឪ" KHMER INDEPENDENT VOWEL QUUV
-                 U+17A7: "ឧ" KHMER INDEPENDENT VOWEL QU
-                 U+17B1: "ឱ" KHMER INDEPENDENT VOWEL QOO TYPE ONE
-                 U+17B3: "ឳ" KHMER INDEPENDENT VOWEL QAU
-                 U+17A9: "ឩ" KHMER INDEPENDENT VOWEL QUU
-                 U+17A8: "ឨ" KHMER INDEPENDENT VOWEL QUK -->
-            <Key
-                latin:keySpec="&#x17AA;"
-                latin:keyHintLabel="&#x17A7;"
-                latin:moreKeys="&#x17A7;,&#x17B1;,&#x17B3;,&#x17A9;,&#x17A8;" />
-        </default>
-    </switch>
-</merge>
diff --git a/java/res/xml/rowkeys_khmer3.xml b/java/res/xml/rowkeys_khmer3.xml
deleted file mode 100644
index 1201c0fed..000000000
--- a/java/res/xml/rowkeys_khmer3.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2013, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <switch>
-        <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
-            <!-- U+17B6/U+17C6: "ាំ" KHMER VOWEL SIGN AA/KHMER SIGN NIKAHIT -->
-            <Key
-                latin:keySpec="&#x17B6;&#x17C6;"
-                latin:keyLabelFlags="followKeyLetterRatio" />
-            <!-- U+17C3: "ៃ" KHMER VOWEL SIGN AI -->
-            <Key latin:keySpec="&#x17C3;" />
-            <!-- U+178C: "ឌ" KHMER LETTER DO -->
-            <Key latin:keySpec="&#x178C;" />
-            <!-- U+1792: "ធ" KHMER LETTER THO -->
-            <Key latin:keySpec="&#x1792;" />
-            <!-- U+17A2: "អ" KHMER LETTER QA -->
-            <Key latin:keySpec="&#x17A2;" />
-            <!-- U+17C7: "ះ" KHMER SIGN REAHMUK
-                 U+17C8: "ៈ" KHMER SIGN YUUKALEAPINTU -->
-            <Key
-                latin:keySpec="&#x17C7;"
-                latin:keyHintLabel="&#x17C8;"
-                latin:moreKeys="&#x17C8;" />
-            <!-- U+1789: "ញ" KHMER LETTER NYO -->
-            <Key latin:keySpec="&#x1789;" />
-            <!-- U+1782: "គ" KHMER LETTER KO
-                 U+179D: "ឝ" KHMER LETTER SHA -->
-            <Key
-                latin:keySpec="&#x1782;"
-                latin:keyHintLabel="&#x179D;"
-                latin:moreKeys="&#x179D;" />
-            <!-- U+17A1: "ឡ" KHMER LETTER LA -->
-            <Key latin:keySpec="&#x17A1;" />
-            <!-- U+17C4/U+17C7: "ោះ" KHMER VOWEL SIGN OO/KHMER SIGN REAHMUK -->
-            <Key
-                latin:keySpec="&#x17C4;&#x17C7;"
-                latin:keyLabelFlags="followKeyLetterRatio|autoScale" />
-            <!-- U+17C9: "៉" KHMER SIGN MUUSIKATOAN -->
-            <Key latin:keySpec="&#x17C9;" />
-            <!-- U+17AF: "ឯ" KHMER INDEPENDENT VOWEL QE -->
-            <Key latin:keySpec="&#x17AF;" />
-        </case>
-        <default>
-            <!-- U+17B6: "ា" KHMER VOWEL SIGN AA -->
-            <Key latin:keySpec="&#x17B6;" />
-            <!-- U+179F: "ស" KHMER LETTER SA -->
-            <Key latin:keySpec="&#x179F;" />
-            <!-- U+178A: "ដ" KHMER LETTER DA -->
-            <Key latin:keySpec="&#x178A;" />
-            <!-- U+1790: "ថ" KHMER LETTER THA -->
-            <Key latin:keySpec="&#x1790;" />
-            <!-- U+1784: "ង" KHMER LETTER NGO -->
-            <Key latin:keySpec="&#x1784;" />
-            <!-- U+17A0: "ហ" KHMER LETTER HA -->
-            <Key latin:keySpec="&#x17A0;" />
-            <!-- U+17D2: "្" KHMER SIGN COENG -->
-            <Key latin:keySpec="&#x17D2;" />
-            <!-- U+1780: "ក" KHMER LETTER KA -->
-            <Key latin:keySpec="&#x1780;" />
-            <!-- U+179B: "ល" KHMER LETTER LO -->
-            <Key latin:keySpec="&#x179B;" />
-            <!-- U+17BE: "ើ" KHMER VOWEL SIGN OE -->
-            <Key latin:keySpec="&#x17BE;" />
-            <!-- U+17CB: "់" KHMER SIGN BANTOC -->
-            <Key latin:keySpec="&#x17CB;" />
-            <!-- U+17AE: "ឮ" KHMER INDEPENDENT VOWEL LYY
-                 U+17AD: "ឭ" KHMER INDEPENDENT VOWEL LY
-                 U+17B0: "ឰ" KHMER INDEPENDENT VOWEL QAI -->
-            <Key
-                latin:keySpec="&#x17AE;"
-                latin:keyHintLabel="&#x17AD;"
-                latin:moreKeys="&#x17AD;,&#x17B0;" />
-        </default>
-    </switch>
-</merge>
diff --git a/java/res/xml/rowkeys_khmer4.xml b/java/res/xml/rowkeys_khmer4.xml
deleted file mode 100644
index 8f1ce82ee..000000000
--- a/java/res/xml/rowkeys_khmer4.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2013, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <switch>
-        <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
-            <!-- U+178D: "ឍ" KHMER LETTER TTHO -->
-            <Key latin:keySpec="&#x178D;" />
-            <!-- U+1783: "ឃ" KHMER LETTER KHO -->
-            <Key latin:keySpec="&#x1783;" />
-            <!-- U+1787: "ជ" KHMER LETTER CO -->
-            <Key latin:keySpec="&#x1787;" />
-            <!-- U+17C1/U+17C7: "េះ" KHMER VOWEL SIGN E/KHMER SIGN REAHMUK -->
-            <Key
-                latin:keySpec="&#x17C1;&#x17C7;"
-                latin:keyLabelFlags="followKeyLetterRatio" />
-            <!-- U+1796: "ព" KHMER LETTER PO
-                 U+179E: "ឞ" KHMER LETTER SSO -->
-            <Key
-                latin:keySpec="&#x1796;"
-                latin:keyHintLabel="&#x179E;"
-                latin:moreKeys="&#x179E;" />
-            <!-- U+178E: "ណ" KHMER LETTER NNO -->
-            <Key latin:keySpec="&#x178E;" />
-            <!-- U+17C6: "ំ" KHMER SIGN NIKAHIT -->
-            <Key latin:keySpec="&#x17C6;" />
-            <!-- U+17BB/U+17C7: "ុះ" KHMER VOWEL SIGN U/KHMER SIGN REAHMUK -->
-            <Key
-                latin:keySpec="&#x17BB;&#x17C7;"
-                latin:keyLabelFlags="followKeyLetterRatio" />
-            <!-- U+17D5: "៕" KHMER SIGN BARIYOOSAN -->
-            <Key latin:keySpec="&#x17D5;" />
-            <Key
-                latin:keySpec="\?"
-                latin:keyLabelFlags="fontDefault" />
-        </case>
-        <default>
-            <!-- U+178B: "ឋ" KHMER LETTER TTHA -->
-            <Key latin:keySpec="&#x178B;" />
-            <!-- U+1781: "ខ" KHMER LETTER KHA -->
-            <Key latin:keySpec="&#x1781;" />
-            <!-- U+1785: "ច" KHMER LETTER CA -->
-            <Key latin:keySpec="&#x1785;" />
-            <!-- U+179C: "វ" KHMER LETTER VO -->
-            <Key latin:keySpec="&#x179C;" />
-            <!-- U+1794: "ប" KHMER LETTER BA -->
-            <Key latin:keySpec="&#x1794;" />
-            <!-- U+1793: "ន" KHMER LETTER NO -->
-            <Key latin:keySpec="&#x1793;" />
-            <!-- U+1798: "ម" KHMER LETTER MO -->
-            <Key latin:keySpec="&#x1798;" />
-            <!-- U+17BB/U+17C6: "ុំ" KHMER VOWEL SIGN U/KHMER SIGN NIKAHIT -->
-            <Key
-                latin:keySpec="&#x17BB;&#x17C6;"
-                latin:keyLabelFlags="followKeyLetterRatio" />
-            <!-- U+17D4: "។" KHMER SIGN KHAN -->
-            <Key latin:keySpec="&#x17D4;" />
-            <!-- U+17CA: "៊" KHMER SIGN TRIISAP -->
-            <Key latin:keySpec="&#x17CA;" />
-        </default>
-    </switch>
-</merge>
diff --git a/java/res/xml/rowkeys_kurdish1.xml b/java/res/xml/rowkeys_kurdish1.xml
deleted file mode 100644
index 882832527..000000000
--- a/java/res/xml/rowkeys_kurdish1.xml
+++ /dev/null
@@ -1,169 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-
-    <switch>
-    <case
-        latin:keyboardLayoutSetElement="alphabet|alphabetAutomaticShifted|alphabetShiftLocked"
-        >
-        <!-- U+0642: "ق" ARABIC LETTER QAF
-        U+x0060   "`" SYMBOL BACKTICK -->
-    <Key
-        latin:keySpec="&#x0642;"
-        latin:keyHintLabel="1"
-        latin:additionalMoreKeys="&#x0060;,&#x0661;,1"
-
-        />
-    <!-- U+0648: "و" ARABIC LETTER WAW
-         U+0648: "وو" ARABIC LETTER DOUBLE WAW -->
-    <Key
-        latin:keySpec="&#x0648;"
-        latin:keyHintLabel="2"
-        latin:additionalMoreKeys="&#x0648;&#x0648;,&#x0662;,2" />
-    <!-- U+06D5: "ە" ARABIC LETTER BZWEN
-         U+064A: "ی" ARABIC LETTER YA WITH DOUBLE DOT -->
-    <Key
-        latin:keySpec="&#x06D5;"
-        latin:keyHintLabel="3"
-        latin:additionalMoreKeys="&#x064A;,&#x0663;,3" />
-    <!-- U+0631: "ر" ARABIC LETTER REH
-         U+0695: "ڕ" KURDISH LETTER RAA -->
-    <Key
-        latin:keySpec="&#x0631;"
-        latin:keyHintLabel="4"
-        latin:additionalMoreKeys="&#x0695;,&#x0664;,4" />
-    <!-- U+062A: "ت" ARABIC LETTER TEH
-         U+0637: "ط" ARABIC LETTER TA -->
-    <Key
-        latin:keySpec="&#x062A;"
-        latin:keyHintLabel="5"
-        latin:additionalMoreKeys="&#x0637;,&#x0665;,5" />
-    <!-- U+06CC: "ی" ARABIC LETTER KURDISH YEH
-         U+06CE: "ێ" KURDISH LETTER KURDISH YE  -->
-    <Key
-        latin:keySpec="&#x06CC;"
-        latin:keyHintLabel="6"
-        latin:additionalMoreKeys="&#x06CE;,&#x0666;,6" />
-    <!-- U+0626: "ئ" ARABIC LETTER YEH WITH HAMZA ABOVE
-         U+0621: "ء" ARABIC LETTER A -->
-    <Key
-        latin:keySpec="&#x0626;"
-        latin:keyHintLabel="7"
-        latin:additionalMoreKeys="&#x0621;,&#x0667;,7" />
-    <!-- U+062D: "ح" ARABIC LETTER HA
-         U+0639: "ع" ARABIC LETTER AA -->
-    <Key
-        latin:keySpec="&#x062D;"
-        latin:keyHintLabel="8"
-        latin:additionalMoreKeys="&#x0639;,&#x0668;,8" />
-    <!-- U+06C6: "ۆ" KURDISH LETTER WO
-         U+0624: "ؤ" ARABIC LETTER WA-->
-    <Key
-        latin:keySpec="&#x06C6;"
-        latin:keyHintLabel="9"
-        latin:additionalMoreKeys="&#x0624;,&#x0669;,9" />
-    <!-- U+067E: "پ" KURDISH LETTER PA
-         U+062B: "ث" ARABIC LETTER THA -->
-
-    <Key
-        latin:keySpec="&#x067E;"
-        latin:keyHintLabel="0"
-        latin:additionalMoreKeys="&#x062B;,&#x0660;,0" />
-    </case>
-        <!-- reverse layout additional keys is spec and spec is addicat-->
-        <default>
-            <!-- U+x0060   "`" SYMBOL BACKTICK
-            U+0642: "ق" ARABIC LETTER QAF-->
-        <Key
-            latin:keySpec="&#x0060;"
-            latin:keyHintLabel="1"
-            latin:additionalMoreKeys="&#x0642;,&#x0661;,1" />
-        <!-- U+0648: "وو" ARABIC LETTER DOUBLE WAW
-             U+0648: "و" ARABIC LETTER WAW -->
-        <Key
-            latin:keySpec="&#x0648;&#x0648;"
-            latin:keyHintLabel="2"
-            latin:additionalMoreKeys="&#x0648;,&#x0662;,2" />
-        <!-- U+064A: "ی" ARABIC LETTER YA WITH DOUBLE DOT
-             U+06D5: "ە" ARABIC LETTER BZWEN -->
-        <Key
-            latin:keySpec="&#x064A;"
-            latin:keyHintLabel="3"
-            latin:additionalMoreKeys="
-            &#x06D5;,&#x0663;,3" />
-        <!-- U+0695: "ڕ" KURDISH LETTER RAA
-             U+0631: "ر" ARABIC LETTER REH -->
-        <Key
-            latin:keySpec="&#x0695;"
-            latin:keyHintLabel="4"
-            latin:additionalMoreKeys="
-            &#x0631;,&#x0664;,4" />
-        <!-- U+0637: "ط" ARABIC LETTER TA
-             U+062A: "ت" ARABIC LETTER TEH -->
-        <Key
-            latin:keySpec="&#x0637;"
-            latin:keyHintLabel="5"
-            latin:additionalMoreKeys="
-            &#x062A;,&#x0665;,5" />
-        <!-- U+06CE: "ێ" KURDISH LETTER KURDISH YE
-             U+06CC: "ی" ARABIC LETTER KURDISH YEH -->
-        <Key
-            latin:keySpec="&#x06CE;"
-            latin:keyHintLabel="6"
-            latin:additionalMoreKeys="
-            &#x06CC;,&#x0666;,6" />
-        <!-- U+0621: "ء" ARABIC LETTER A
-             U+0626: "ئ" ARABIC LETTER YEH WITH HAMZA ABOVE -->
-        <Key
-            latin:keySpec="&#x0621;"
-            latin:keyHintLabel="7"
-            latin:additionalMoreKeys="
-            &#x0626;,&#x0667;,7" />
-        <!-- U+0639: "ع" ARABIC LETTER AA
-             U+062D: "ح" ARABIC LETTER HA -->
-        <Key
-            latin:keySpec="&#x0639;"
-            latin:keyHintLabel="8"
-            latin:additionalMoreKeys="
-            &#x062D;,&#x0668;,8" />
-        <!-- U+0624: "ؤ" ARABIC LETTER WA
-             U+06C6: "ۆ" KURDISH LETTER WO -->
-        <Key
-            latin:keySpec="&#x0624;"
-            latin:keyHintLabel="9"
-            latin:additionalMoreKeys="
-            &#x06C6;,&#x0669;,9" />
-        <!-- U+062B: "ث" ARABIC LETTER THA
-             U+067E: "پ" KURDISH LETTER PA -->
-        <Key
-            latin:keySpec="&#x062B;"
-            latin:keyHintLabel="0"
-            latin:additionalMoreKeys="
-            &#x067E;,&#x0660;,0" />
-
-
-    </default>
-
-    </switch>
-
-
-</merge>
-
diff --git a/java/res/xml/rowkeys_kurdish2.xml b/java/res/xml/rowkeys_kurdish2.xml
deleted file mode 100644
index a1c60bca5..000000000
--- a/java/res/xml/rowkeys_kurdish2.xml
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <switch>
-    <case
-        latin:keyboardLayoutSetElement="alphabet|alphabetAutomaticShifted|alphabetShiftLocked"
-        >
-    <!-- U+x0627: "ا" ARABIC LETTER ALF
-         U+x0622: "آ" ARABIC LETTER ALF WITH SHADA  -->
-
-    <Key
-        latin:keySpec="&#x0627;"
-        latin:moreKeys="&#x0622;" />
-    <!-- U+0633: "س" ARABIC LETTER SEEN
-         U+0634: "ش" ARABIC LETTER SHA -->
-    <Key latin:keySpec="&#x0633;"
-        latin:moreKeys="&#x0634;"
-        />
-    <!-- U+062F: "د" ARABIC LETTER DAL
-         U+0630: "ذ" ARABIC LETTER THAL
-    -->
-    <Key
-        latin:keySpec="&#x062F;"
-        latin:moreKeys="&#x0630;" />
-    <!-- U+0641: "ف" ARABIC LETTER FAH
-         U+0625: "إ" ARABIC LETTER ALF WITH KASRA  -->
-    <Key
-        latin:keySpec="&#x0641;"
-        latin:moreKeys="&#x0625;" />
-    <!-- U+06AF: "گ" KURDISH LETTER G
-         U+063A: "غ" ARABIC LETTER GH
-    -->
-    <Key
-        latin:keySpec="&#x06AF;"
-        latin:moreKeys="&#x063A;" />
-    <!-- U+0627: "ه" KURDISH LETTER HA
-         U+200C: "" KURDISH LETTER NO SPACE BREAK -->
-    <Key
-        latin:keySpec="&#x0647;"
-        latin:moreKeys="&#x200C;" />
-    <!-- U+062A: "ژ" KURDISH LETTER ZH
-         U+0623: "أ" ARABIC LETTER ALF WITH HAMZA ABOVE
-     -->
-    <Key latin:keySpec="&#x0698;"
-         latin:moreKeys="&#x0623;" />
-    <!-- U+06A9: "ک" ARABIC LETTER KAF
-         U+0643: "ك" ARABIC LETTER ISOLATE KAF
-    -->
-    <Key latin:keySpec="&#x06A9;"
-        latin:moreKeys="&#x0643;" />
-    <!-- U+0644: "ل" ARABIC LETTER LAM
-          U+06B5: "ل" KURDISH LETTER LAA  -->
-    <Key latin:keySpec="&#x0644;"
-        latin:moreKeys="&#x06B5;" />
-    </case>
-        <default>
-            <!-- swap keyspec with morekeys -->
-            <!-- U+x0622: "آ" ARABIC LETTER ALF WITH SHADA
-                 U+x0627: "ا" ARABIC LETTER ALF  -->
-            <Key
-                latin:keySpec="&#x0622;"
-                latin:moreKeys="&#x0627;" />
-            <!-- U+0634: "ش" ARABIC LETTER SHA
-                 U+0633: "س" ARABIC LETTER SEEN -->
-            <Key latin:keySpec="&#x0634;"
-                latin:moreKeys="&#x0633;"
-                />
-            <!-- U+0630: "ذ" ARABIC LETTER THAL
-                 U+062F: "د" ARABIC LETTER DAL -->
-            <Key
-                latin:keySpec="&#x0630;"
-                latin:moreKeys="&#x062F;" />
-            <!-- U+0625: "إ" ARABIC LETTER ALF WITH KASRA
-                 U+0641: "ف" ARABIC LETTER FAH -->
-            <Key
-                latin:keySpec="&#x0625;"
-                latin:moreKeys="&#x0641;" />
-            <!-- U+063A: "غ" ARABIC LETTER GH
-                 U+06AF: "گ" KURDISH LETTER G -->
-            <Key
-                latin:keySpec="&#x063A;"
-                latin:moreKeys="&#x06AF;" />
-            <!-- U+200C: "" KURDISH LETTER NO SPACE BREAK
-                 U+0647: "ه" KURDISH LETTER HA -->
-            <Key
-                latin:keySpec="&#x200C;"
-                latin:moreKeys="&#x0647;" />
-            <!-- U+0623: "أ" ARABIC LETTER ALF WITH HAMZA ABOVE
-                 U+0698: "ژ" KURDISH LETTER ZH -->
-            <Key latin:keySpec="&#x0623;"
-                    latin:moreKeys="&#x0698;" />
-            <!-- U+0643: "ك" ARABIC LETTER ISOLATE KAF
-                    U+06A9: "ک" ARABIC LETTER KAF -->
-            <Key latin:keySpec="&#x0643;"
-                latin:moreKeys="&#x06A9;" />
-            <!-- U+06B5: "ل" KURDISH LETTER LAA
-                 U+0644: "ل" ARABIC LETTER LAM -->
-            <Key latin:keySpec="&#x06B5;"
-                latin:moreKeys="&#x0644;" />
-        </default>
-
-
-    </switch>
-
-</merge>
diff --git a/java/res/xml/rowkeys_kurdish3.xml b/java/res/xml/rowkeys_kurdish3.xml
deleted file mode 100644
index 98dd403be..000000000
--- a/java/res/xml/rowkeys_kurdish3.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <switch>
-    <case
-        latin:keyboardLayoutSetElement="alphabet|alphabetAutomaticShifted|alphabetShiftLocked"
-        >
-    <!-- U+0632: "ز" ARABIC LETTER Z
-         U+0636: "ض" ARABIC LETTER THAD   -->
-    <Key latin:keySpec="&#x0632;"
-        latin:moreKeys="&#x0636;"
-        />
-    <!-- U+0624: "خ" ARABIC LETTER XA
-         U+0635: "ص" ARABIC LETTER THAD
-    -->
-    <Key latin:keySpec="&#x062E;"
-         latin:moreKeys="&#x0635;"
-        />
-    <!-- U+0631: "ج" ARABIC LETTER JIM
-         U+0686: "چ" KURDISH LETTER CH -->
-    <Key latin:keySpec="&#x062C;"
-        latin:moreKeys="&#x0686;" />
-
-    <!-- U+0649: "ڤ" KURDISH LETTER V
-         U+0638: "ظ" ARABIC LETTER THA -->
-    <Key
-        latin:keySpec="&#x06A4;"
-        latin:moreKeys="&#x0638;" />
-    <!-- U+0629: "ب" ARABIC LETTER BA
-         U+0649: "ى" ARABIC LETTER YA
-    -->
-    <Key latin:keySpec="&#x0628;"
-        latin:moreKeys="&#x0649;"/>
-    <!-- U+0648: "ن" ARABIC LETTER NUN
-         U+0648: "ة" ARABIC LETTER TA
-    -->
-    <Key latin:keySpec="&#x0646;"
-        latin:moreKeys="&#x0648;"/>
-    <!-- U+0632: "م" ARABIC LETTER MEEM
-         U+0698: "-" SYMBOL Dash -->
-    <Key
-        latin:keySpec="&#x0645;"
-        latin:moreKeys="&#x0640;" />
-    </case>
-        <default>
-        <!-- swap keyspec with morekeys -->
-            <!-- U+0636: "ض" ARABIC LETTER THAD
-                 U+0632: "ز" ARABIC LETTER Z    -->
-            <Key latin:keySpec="&#x0636;"
-                latin:moreKeys="&#x0632;"
-                />
-            <!-- U+0635: "ص" ARABIC LETTER THAD
-                 U+062E: "خ" ARABIC LETTER XA
-            -->
-            <Key latin:keySpec="&#x0635;"
-                 latin:moreKeys="&#x062E;"
-                />
-            <!-- U+0686: "چ" KURDISH LETTER CH
-                 U+062C: "ج" ARABIC LETTER JIM -->
-            <Key latin:keySpec="&#x0686;"
-                latin:moreKeys="&#x062C;" />
-
-            <!-- U+0638: "ظ" ARABIC LETTER THA
-                 U+06A4: "ڤ" KURDISH LETTER V -->
-            <Key
-                latin:keySpec="&#x0638;"
-                latin:moreKeys="&#x06A4;"
-                />
-            <!-- U+0649: "ى" ARABIC LETTER YA
-                 U+0628: "ب" ARABIC LETTER BA
-            -->
-            <Key latin:keySpec="&#x0649;"
-                latin:moreKeys="&#x0628;"/>
-            <!-- U+0648: "ة" ARABIC LETTER TA
-                 U+0646: "ن" ARABIC LETTER NUN
-            -->
-            <Key latin:keySpec="&#x0648;"
-                latin:moreKeys="&#x0646;"/>
-            <!-- U+0640: "-" SYMBOL Dash
-                 U+0645: "م" ARABIC LETTER MEEM -->
-            <Key
-                latin:keySpec="&#x0640;"
-                latin:moreKeys="&#x0645;"
-                />
-
-
-
-
-
-        </default>
-    </switch>
-
-</merge>
diff --git a/java/res/xml/rowkeys_lao1.xml b/java/res/xml/rowkeys_lao1.xml
deleted file mode 100644
index 020e4b9ff..000000000
--- a/java/res/xml/rowkeys_lao1.xml
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2013, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <switch>
-        <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
-            <!-- U+0ED1: "໑" LAO DIGIT ONE -->
-            <Key latin:keySpec="&#x0ED1;" />
-            <!-- U+0ED2: "໒" LAO DIGIT TWO -->
-            <Key latin:keySpec="&#x0ED2;" />
-            <!-- U+0ED3: "໓" LAO DIGIT THREE -->
-            <Key latin:keySpec="&#x0ED3;" />
-            <!-- U+0ED4: "໔" LAO DIGIT FOUR -->
-            <Key latin:keySpec="&#x0ED4;" />
-            <!-- U+0ECC: "໌" LAO CANCELLATION MARK -->
-            <Key latin:keySpec="&#x0ECC;" />
-            <!-- U+0EBC: "ຼ" LAO SEMIVOWEL SIGN LO -->
-            <Key latin:keySpec="&#x0EBC;" />
-            <!-- U+0ED5: "໕" LAO DIGIT FIVE -->
-            <Key latin:keySpec="&#x0ED5;" />
-            <!-- U+0ED6: "໖" LAO DIGIT SIX -->
-            <Key latin:keySpec="&#x0ED6;" />
-            <!-- U+0ED7: "໗" LAO DIGIT SEVEN -->
-            <Key latin:keySpec="&#x0ED7;" />
-            <!-- U+0ED8: "໘" LAO DIGIT EIGHT -->
-            <Key latin:keySpec="&#x0ED8;" />
-            <!-- U+0ED9: "໙" LAO DIGIT NINE -->
-            <Key latin:keySpec="&#x0ED9;" />
-            <!-- U+0ECD/U+0EC8: "ໍ່" LAO NIGGAHITA/LAO TONE MAI EK -->
-            <Key
-                latin:keySpec="&#x0ECD;&#x0EC8;"
-                latin:keyLabelFlags="followKeyLetterRatio" />
-        </case>
-        <default>
-            <!-- U+0EA2: "ຢ" LAO LETTER YO
-                 U+0ED1: "໑" LAO DIGIT ONE -->
-            <Key
-                latin:keySpec="&#x0EA2;"
-                latin:keyHintLabel="1"
-                latin:additionalMoreKeys="1"
-                latin:moreKeys="&#x0ED1;" />
-            <!-- U+0E9F: "ຟ" LAO LETTER FO SUNG
-                 U+0ED2: "໒" LAO DIGIT TWO -->
-            <Key
-                latin:keySpec="&#x0E9F;"
-                latin:keyHintLabel="2"
-                latin:additionalMoreKeys="2"
-                latin:moreKeys="&#x0ED2;" />
-            <!-- U+0EC2: "ໂ" LAO VOWEL SIGN O
-                 U+0ED3: "໓" LAO DIGIT THREE -->
-            <Key
-                latin:keySpec="&#x0EC2;"
-                latin:keyHintLabel="3"
-                latin:additionalMoreKeys="3"
-                latin:moreKeys="&#x0ED3;" />
-            <!-- U+0E96: "ຖ" LAO LETTER THO SUNG
-                 U+0ED4: "໔" LAO DIGIT FOUR -->
-            <Key
-                latin:keySpec="&#x0E96;"
-                latin:keyHintLabel="4"
-                latin:additionalMoreKeys="4"
-                latin:moreKeys="&#x0ED4;" />
-            <!-- U+0EB8: "ຸ" LAO VOWEL SIGN U -->
-            <Key latin:keySpec="&#x0EB8;" />
-            <!-- U+0EB9: "ູ" LAO VOWEL SIGN UU -->
-            <Key latin:keySpec="&#x0EB9;" />
-            <!-- U+0E84: "ຄ" LAO LETTER KHO TAM
-                 U+0ED5: "໕" LAO DIGIT FIVE -->
-            <Key
-                latin:keySpec="&#x0E84;"
-                latin:keyHintLabel="5"
-                latin:additionalMoreKeys="5"
-                latin:moreKeys="&#x0ED5;" />
-            <!-- U+0E95: "ຕ" LAO LETTER TO
-                 U+0ED6: "໖" LAO DIGIT SIX -->
-            <Key
-                latin:keySpec="&#x0E95;"
-                latin:keyHintLabel="6"
-                latin:additionalMoreKeys="6"
-                latin:moreKeys="&#x0ED6;" />
-            <!-- U+0E88: "ຈ" LAO LETTER CO
-                 U+0ED7: "໗" LAO DIGIT SEVEN -->
-            <Key
-                latin:keySpec="&#x0E88;"
-                latin:keyHintLabel="7"
-                latin:additionalMoreKeys="7"
-                latin:moreKeys="&#x0ED7;" />
-            <!-- U+0E82: "ຂ" LAO LETTER KHO SUNG
-                 U+0ED8: "໘" LAO DIGIT EIGHT -->
-            <Key
-                latin:keySpec="&#x0E82;"
-                latin:keyHintLabel="8"
-                latin:additionalMoreKeys="8"
-                latin:moreKeys="&#x0ED8;" />
-            <!-- U+0E8A: "ຊ" LAO LETTER SO TAM
-                 U+0ED9: "໙" LAO DIGIT NINE -->
-            <Key
-                latin:keySpec="&#x0E8A;"
-                latin:keyHintLabel="9"
-                latin:additionalMoreKeys="9"
-                latin:moreKeys="&#x0ED9;" />
-            <!-- U+0ECD: "ໍ" LAO NIGGAHITA -->
-            <Key latin:keySpec="&#x0ECD;" />
-        </default>
-    </switch>
-</merge>
diff --git a/java/res/xml/rowkeys_lao2.xml b/java/res/xml/rowkeys_lao2.xml
deleted file mode 100644
index 56b6f26fe..000000000
--- a/java/res/xml/rowkeys_lao2.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2013, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <switch>
-        <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
-            <!-- U+0EBB/U+0EC9: "" LAO VOWEL SIGN MAI KON/LAO TONE MAI THO -->
-            <Key
-                latin:keySpec="&#x0EBB;&#x0EC9;"
-                latin:keyLabelFlags="followKeyLetterRatio" />
-            <!-- U+0ED0: "໐" LAO DIGIT ZERO -->
-            <Key latin:keySpec="&#x0ED0;" />
-            <!-- U+0EB3/U+0EC9: "ຳ້" LAO VOWEL SIGN AM/LAO TONE MAI THO -->
-            <Key
-                latin:keySpec="&#x0EB3;&#x0EC9;"
-                latin:keyLabelFlags="followKeyLetterRatio" />
-            <Key
-                latin:keySpec="_"
-                latin:keyLabelFlags="fontDefault" />
-            <Key
-                latin:keySpec="+"
-                latin:keyLabelFlags="fontDefault" />
-            <!-- U+0EB4/U+0EC9: "ິ້" LAO VOWEL SIGN I/LAO TONE MAI THO -->
-            <Key
-                latin:keySpec="&#x0EB4;&#x0EC9;"
-                latin:keyLabelFlags="followKeyLetterRatio" />
-            <!-- U+0EB5/U+0EC9: "ີ້" LAO VOWEL SIGN II/LAO TONE MAI THO -->
-            <Key
-                latin:keySpec="&#x0EB5;&#x0EC9;"
-                latin:keyLabelFlags="followKeyLetterRatio" />
-            <!-- U+0EA3: "ຣ" LAO LETTER LO LING -->
-            <Key latin:keySpec="&#x0EA3;" />
-            <!-- U+0EDC: "ໜ" LAO HO NO -->
-            <Key latin:keySpec="&#x0EDC;" />
-            <!-- U+0EBD: "ຽ" LAO SEMIVOWEL SIGN NYO -->
-            <Key latin:keySpec="&#x0EBD;" />
-            <!-- U+0EAB/U+0EBC: "" LAO LETTER HO SUNG/LAO SEMIVOWEL SIGN LO -->
-            <Key
-                latin:keySpec="&#x0EAB;&#x0EBC;"
-                latin:keyLabelFlags="followKeyLetterRatio" />
-            <!-- U+201D: "”" RIGHT DOUBLE QUOTATION MARK -->
-            <Key
-                latin:keySpec="&#x201D;"
-                latin:keyLabelFlags="fontDefault" />
-        </case>
-        <default>
-            <!-- U+0EBB: "ົ" LAO VOWEL SIGN MAI KON -->
-            <Key latin:keySpec="&#x0EBB;" />
-            <!-- U+0EC4: "ໄ" LAO VOWEL SIGN AI
-                 U+0ED0: "໐" LAO DIGIT ZERO -->
-            <Key
-                latin:keySpec="&#x0EC4;"
-                latin:keyHintLabel="0"
-                latin:additionalMoreKeys="0"
-                latin:moreKeys="&#x0ED0;" />
-            <!-- U+0EB3: "ຳ" LAO VOWEL SIGN AM -->
-            <Key latin:keySpec="&#x0EB3;" />
-            <!-- U+0E9E: "ພ" LAO LETTER PHO TAM -->
-            <Key latin:keySpec="&#x0E9E;" />
-            <!-- U+0EB0: "ະ" LAO VOWEL SIGN A -->
-            <Key latin:keySpec="&#x0EB0;" />
-            <!-- U+0EB4: "ິ" LAO VOWEL SIGN I -->
-            <Key latin:keySpec="&#x0EB4;" />
-            <!-- U+0EB5: "ີ" LAO VOWEL SIGN II -->
-            <Key latin:keySpec="&#x0EB5;" />
-            <!-- U+0EAE: "ຮ" LAO LETTER HO TAM -->
-            <Key latin:keySpec="&#x0EAE;" />
-            <!-- U+0E99: "ນ" LAO LETTER NO -->
-            <Key latin:keySpec="&#x0E99;" />
-            <!-- U+0E8D: "ຍ" LAO LETTER NYO -->
-            <Key latin:keySpec="&#x0E8D;" />
-            <!-- U+0E9A: "ບ" LAO LETTER BO -->
-            <Key latin:keySpec="&#x0E9A;" />
-            <!-- U+0EA5: "ລ" LAO LETTER LO LOOT -->
-            <Key latin:keySpec="&#x0EA5;" />
-        </default>
-    </switch>
-</merge>
diff --git a/java/res/xml/rowkeys_lao3.xml b/java/res/xml/rowkeys_lao3.xml
deleted file mode 100644
index f59e0dcd0..000000000
--- a/java/res/xml/rowkeys_lao3.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2013, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <switch>
-        <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
-            <!-- U+0EB1/U+0EC9: "ັ້" LAO VOWEL SIGN MAI KAN/LAO TONE MAI THO -->
-            <Key
-                latin:keySpec="&#x0EB1;&#x0EC9;"
-                latin:keyLabelFlags="followKeyLetterRatio" />
-            <Key
-                latin:keySpec=";"
-                latin:keyLabelFlags="fontDefault" />
-            <Key
-                latin:keySpec="."
-                latin:keyLabelFlags="fontDefault" />
-            <Key
-                latin:keySpec=","
-                latin:keyLabelFlags="fontDefault" />
-            <Key
-                latin:keySpec=":"
-                latin:keyLabelFlags="fontDefault" />
-            <!-- U+0ECA: "໊" LAO TONE MAI TI -->
-            <Key latin:keySpec="&#x0ECA;" />
-            <!-- U+0ECB: "໋" LAO TONE MAI CATAWA -->
-            <Key latin:keySpec="&#x0ECB;" />
-            <Key
-                latin:keySpec="!"
-                latin:keyLabelFlags="fontDefault" />
-            <Key
-                latin:keySpec="\?"
-                latin:keyLabelFlags="fontDefault" />
-            <Key
-                latin:keySpec="%"
-                latin:keyLabelFlags="fontDefault" />
-            <Key
-                latin:keySpec="="
-                latin:keyLabelFlags="fontDefault" />
-            <!-- U+201C: "“" LEFT DOUBLE QUOTATION MARK -->
-            <Key
-                latin:keySpec="&#x201C;"
-                latin:keyLabelFlags="fontDefault" />
-        </case>
-        <default>
-            <!-- U+0EB1: "ັ" LAO VOWEL SIGN MAI KAN -->
-            <Key latin:keySpec="&#x0EB1;" />
-            <!-- U+0EAB: "ຫ" LAO LETTER HO SUNG -->
-            <Key latin:keySpec="&#x0EAB;" />
-            <!-- U+0E81: "ກ" LAO LETTER KO -->
-            <Key latin:keySpec="&#x0E81;" />
-            <!-- U+0E94: "ດ" LAO LETTER DO -->
-            <Key latin:keySpec="&#x0E94;" />
-            <!-- U+0EC0: "ເ" LAO VOWEL SIGN E -->
-            <Key latin:keySpec="&#x0EC0;" />
-            <!-- U+0EC9: "້" LAO TONE MAI THO -->
-            <Key latin:keySpec="&#x0EC9;" />
-            <!-- U+0EC8: "່" LAO TONE MAI EK -->
-            <Key latin:keySpec="&#x0EC8;" />
-            <!-- U+0EB2: "າ" LAO VOWEL SIGN AA -->
-            <Key latin:keySpec="&#x0EB2;" />
-            <!-- U+0EAA: "ສ" LAO LETTER SO SUNG -->
-            <Key latin:keySpec="&#x0EAA;" />
-            <!-- U+0EA7: "ວ" LAO LETTER WO -->
-            <Key latin:keySpec="&#x0EA7;" />
-            <!-- U+0E87: "ງ" LAO LETTER NGO -->
-            <Key latin:keySpec="&#x0E87;" />
-            <!-- U+201C: "“" LEFT DOUBLE QUOTATION MARK -->
-            <Key
-                latin:keySpec="&#x201C;"
-                latin:keyLabelFlags="fontDefault" />
-        </default>
-    </switch>
-</merge>
diff --git a/java/res/xml/rowkeys_lao4.xml b/java/res/xml/rowkeys_lao4.xml
deleted file mode 100644
index 1b18a120d..000000000
--- a/java/res/xml/rowkeys_lao4.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2013, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <switch>
-        <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
-            <!-- U+20AD: "₭" KIP SIGN -->
-            <Key
-                latin:keySpec="&#x20AD;"
-                latin:keyLabelFlags="fontDefault" />
-            <Key
-                latin:keySpec="("
-                latin:keyLabelFlags="fontDefault" />
-            <Key latin:keySpec="&#x0EAF;" />
-            <Key
-                latin:keySpec="\@"
-                latin:keyLabelFlags="fontDefault" />
-            <!-- U+0EB6/U+0EC9: "ຶ້" LAO VOWEL SIGN Y/LAO TONE MAI THO -->
-            <Key
-                latin:keySpec="&#x0EB6;&#x0EC9;"
-                latin:keyLabelFlags="followKeyLetterRatio" />
-            <!-- U+0EB7/U+0EC9: "ື້" LAO VOWEL SIGN YY/LAO TONE MAI THO -->
-            <Key
-                latin:keySpec="&#x0EB7;&#x0EC9;"
-                latin:keyLabelFlags="followKeyLetterRatio" />
-            <!-- U+0EC6: "ໆ" LAO KO LA -->
-            <Key latin:keySpec="&#x0EC6;" />
-            <!-- U+0EDD: "ໝ" LAO HO MO -->
-            <Key latin:keySpec="&#x0EDD;" />
-            <Key
-                latin:keySpec="$"
-                latin:keyLabelFlags="fontDefault" />
-            <Key
-                latin:keySpec=")"
-                latin:keyLabelFlags="fontDefault" />
-        </case>
-        <default>
-            <!-- U+0E9C: "ຜ" LAO LETTER PHO SUNG -->
-            <Key latin:keySpec="&#x0E9C;" />
-            <!-- U+0E9B: "ປ" LAO LETTER PO -->
-            <Key latin:keySpec="&#x0E9B;" />
-            <!-- U+0EC1: "ແ" LAO VOWEL SIGN EI -->
-            <Key latin:keySpec="&#x0EC1;" />
-            <!-- U+0EAD: "ອ" LAO LETTER O -->
-            <Key latin:keySpec="&#x0EAD;" />
-            <!-- U+0EB6: "ຶ" LAO VOWEL SIGN Y -->
-            <Key latin:keySpec="&#x0EB6;" />
-            <!-- U+0EB7: "ື" LAO VOWEL SIGN YY -->
-            <Key latin:keySpec="&#x0EB7;" />
-            <!-- U+0E97: "ທ" LAO LETTER THO TAM -->
-            <Key latin:keySpec="&#x0E97;" />
-            <!-- U+0EA1: "ມ" LAO LETTER MO -->
-            <Key latin:keySpec="&#x0EA1;" />
-            <!-- U+0EC3: "ໃ" LAO VOWEL SIGN AY -->
-            <Key latin:keySpec="&#x0EC3;" />
-            <!-- U+0E9D: "ຝ" LAO LETTER FO TAM -->
-            <Key latin:keySpec="&#x0E9D;" />
-        </default>
-    </switch>
-</merge>
diff --git a/java/res/xml/rowkeys_malayalam1.xml b/java/res/xml/rowkeys_malayalam1.xml
deleted file mode 100644
index f7d996767..000000000
--- a/java/res/xml/rowkeys_malayalam1.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2014, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto" >
-    <!-- U+0D4D: "്" MALAYALAM SIGN VIRAMA
-         U+0D05: "അ" MALAYALAM LETTER A -->
-    <Key
-        latin:keySpec="&#x0D4D;"
-        latin:moreKeys="&#x0D05;,%"
-        latin:keyHintLabel="1"
-        latin:additionalMoreKeys="1" />
-    <!-- U+0D3E: "ാ" MALAYALAM VOWEL SIGN AA
-         U+0D06: "ആ" MALAYALAM LETTER AA -->
-    <Key
-        latin:keySpec="&#x0D3E;"
-        latin:moreKeys="&#x0D06;,%"
-        latin:keyHintLabel="2"
-        latin:additionalMoreKeys="2" />
-    <!-- U+0D3F: "ി" MALAYALAM VOWEL SIGN I
-         U+0D07: "ഇ" MALAYALAM LETTER I -->
-    <Key
-        latin:keySpec="&#x0D3F;"
-        latin:moreKeys="&#x0D07;,%"
-        latin:keyHintLabel="3"
-        latin:additionalMoreKeys="3" />
-    <!-- U+0D40: "ീ" MALAYALAM VOWEL SIGN II
-         U+0D08: "ഈ" MALAYALAM LETTER II -->
-    <Key
-        latin:keySpec="&#x0D40;"
-        latin:moreKeys="&#x0D08;,%"
-        latin:keyHintLabel="4"
-        latin:additionalMoreKeys="4" />
-    <!-- U+0D41: "ു" MALAYALAM VOWEL SIGN U
-         U+0D09: "ഉ" MALAYALAM LETTER U -->
-    <Key
-        latin:keySpec="&#x0D41;"
-        latin:moreKeys="&#x0D09;,%"
-        latin:keyHintLabel="5"
-        latin:additionalMoreKeys="5" />
-    <!-- U+0D42: "ൂ" MALAYALAM VOWEL SIGN UU
-         U+0D0A: "ഊ" MALAYALAM LETTER UU -->
-    <Key
-        latin:keySpec="&#x0D42;"
-        latin:moreKeys="&#x0D0A;,%"
-        latin:keyHintLabel="6"
-        latin:additionalMoreKeys="6" />
-    <!-- U+0D43: "ൃ" MALAYALAM VOWEL SIGN VOCALIC R
-         U+0D0B: "ഋ" MALAYALAM LETTER VOCALIC R -->
-    <Key
-        latin:keySpec="&#x0D43;"
-        latin:moreKeys="&#x0D0B;,%"
-        latin:keyHintLabel="7"
-        latin:additionalMoreKeys="7" />
-    <!-- U+0D46: "െ" MALAYALAM VOWEL SIGN E
-         U+0D0E: "എ" MALAYALAM LETTER E
-         U+0D10: "ഐ" MALAYALAM LETTER AI
-         U+0D48: "ൈ" MALAYALAM VOWEL SIGN AI -->
-    <Key
-        latin:keySpec="&#x0D46;"
-        latin:moreKeys="&#x0D0E;,&#x0D10;,&#x0D48;,%"
-        latin:keyHintLabel="8"
-        latin:additionalMoreKeys="8" />
-    <!-- U+0D47: "േ" MALAYALAM VOWEL SIGN EE
-         U+0D0F: "ഏ" MALAYALAM LETTER EE -->
-    <Key
-        latin:keySpec="&#x0D47;"
-        latin:moreKeys="&#x0D0F;,%"
-        latin:keyHintLabel="9"
-        latin:additionalMoreKeys="9" />
-    <!-- U+0D4A: "ൊ" MALAYALAM VOWEL SIGN O
-         U+0D12: "ഒ" MALAYALAM LETTER O -->
-    <Key
-        latin:keySpec="&#x0D4A;"
-        latin:moreKeys="&#x0D12;,%"
-        latin:keyHintLabel="0"
-        latin:additionalMoreKeys="0" />
-    <!-- U+0D4B: "ോ" MALAYALAM VOWEL SIGN OO
-         U+0D13: "ഓ" MALAYALAM LETTER OO
-         U+0D14: "ഔ" MALAYALAM LETTER AU
-         U+0D57: "ൗ" MALAYALAM AU LENGTH MARK -->
-    <Key latin:keySpec="&#x0D4B;"
-         latin:moreKeys="&#x0D13;,&#x0D14;,&#x0D57;" />
-</merge>
diff --git a/java/res/xml/rowkeys_malayalam2.xml b/java/res/xml/rowkeys_malayalam2.xml
deleted file mode 100644
index 0c9dd3915..000000000
--- a/java/res/xml/rowkeys_malayalam2.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2014, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <!-- U+0D15: "ക" MALAYALAM LETTER KA
-         U+0D16: "ഖ" MALAYALAM LETTER KHA -->
-    <Key
-        latin:keySpec="&#x0D15;"
-        latin:moreKeys="&#x0D16;" />
-    <!-- U+0D17: "ഗ" MALAYALAM LETTER GA
-         U+0D18: "ഘ" MALAYALAM LETTER GHA -->
-    <Key
-        latin:keySpec="&#x0D17;"
-        latin:moreKeys="&#x0D18;" />
-    <!-- U+0D19: "ങ" MALAYALAM LETTER NGA
-         U+0D1E: "ഞ" MALAYALAM LETTER NYA -->
-    <Key
-        latin:keySpec="&#x0D19;"
-        latin:moreKeys="&#x0D1E;" />
-    <!-- U+0D1A: "ച" MALAYALAM LETTER CA
-         U+0D1B: "ഛ" MALAYALAM LETTER CHA -->
-    <Key
-        latin:keySpec="&#x0D1A;"
-        latin:moreKeys="&#x0D1B;" />
-    <!-- U+0D1C: "ജ" MALAYALAM LETTER JA
-         U+0D1D: "ഝ" MALAYALAM LETTER JHA -->
-    <Key
-        latin:keySpec="&#x0D1C;"
-        latin:moreKeys="&#x0D1D;" />
-    <!-- U+0D1F: "ട" MALAYALAM LETTER TTA
-         U+0D20: "ഠ" MALAYALAM LETTER TTHA -->
-    <Key
-        latin:keySpec="&#x0D1F;"
-        latin:moreKeys="&#x0D20;" />
-    <!-- U+0D21: "ഡ" MALAYALAM LETTER DDA
-         U+0D22: "ഢ" MALAYALAM LETTER DDHA -->
-    <Key
-        latin:keySpec="&#x0D21;"
-        latin:moreKeys="&#x0D22;" />
-    <!-- U+0D23: "ണ" MALAYALAM LETTER NNA
-         U+0D7A: "ൺ" MALAYALAM LETTER CHILLU NN -->
-    <Key
-        latin:keySpec="&#x0D23;"
-        latin:moreKeys="&#x0D7A;" />
-    <!-- U+0D24: "ത" MALAYALAM LETTER TA
-         U+0D25: "ഥ" MALAYALAM LETTER THA -->
-    <Key
-        latin:keySpec="&#x0D24;"
-        latin:moreKeys="&#x0D25;" />
-    <!-- U+0D26: "ദ" MALAYALAM LETTER DA
-         U+0D27: "ധ" MALAYALAM LETTER DHA -->
-    <Key
-        latin:keySpec="&#x0D26;"
-        latin:moreKeys="&#x0D27;" />
-    <!-- U+0D28: "ഗന" MALAYALAM LETTER NA
-         U+0D7B: "ൻ" MALAYALAM LETTER CHILLU N -->
-    <Key
-        latin:keySpec="&#x0D28;"
-        latin:moreKeys="&#x0D7B;" />
-</merge>
diff --git a/java/res/xml/rowkeys_malayalam3.xml b/java/res/xml/rowkeys_malayalam3.xml
deleted file mode 100644
index 5485f1472..000000000
--- a/java/res/xml/rowkeys_malayalam3.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2014, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <!-- U+0D2A: "പ" MALAYALAM LETTER PA
-         U+0D2B: "ഫ" MALAYALAM LETTER PHA -->
-    <Key
-        latin:keySpec="&#x0D2A;"
-        latin:moreKeys="&#x0D2B;" />
-    <!-- U+0D2C: "ബ" MALAYALAM LETTER BA
-         U+0D2D: "ഭ" MALAYALAM LETTER BHA -->
-    <Key
-        latin:keySpec="&#x0D2C;"
-        latin:moreKeys="&#x0D2D;" />
-    <!-- U+0D2E: "മ" MALAYALAM LETTER MA
-         U+0D02: "ം" MALAYALAM SIGN ANUSVARA -->
-    <Key
-        latin:keySpec="&#x0D2E;"
-        latin:moreKeys="&#x0D02;" />
-    <!-- U+0D2F: "യ" MALAYALAM LETTER YA
-         U+0D4D/U+0D2F: "്യ" MALAYALAM SIGN VIRAMA/MALAYALAM LETTER YA -->
-    <Key
-        latin:keySpec="&#x0D2F;"
-        latin:moreKeys="&#x0D4D;&#x0D2F;" />
-    <!-- U+0D30: "ര" MALAYALAM LETTER RA
-         U+0D4D/U+0D30: "്ര" MALAYALAM SIGN VIRAMA/MALAYALAM LETTER RA
-         U+0D7C: "ർ" MALAYALAM LETTER CHILLU RR
-         U+0D31: "റ" MALAYALAM LETTER RRA -->
-    <Key
-        latin:keySpec="&#x0D30;"
-        latin:moreKeys="&#x0D4D;&#x0D30;,&#x0D7C;,&#x0D31;" />
-    <!-- U+0D32: "ല" MALAYALAM LETTER LA
-         U+0D7D: "ൽ" MALAYALAM LETTER CHILLU L -->
-    <Key
-        latin:keySpec="&#x0D32;"
-        latin:moreKeys="&#x0D7D;" />
-    <!-- U+0D35: "വ" MALAYALAM LETTER VA
-         U+0D4D/U+0D35: "്വ" MALAYALAM SIGN VIRAMA/MALAYALAM LETTER VA -->
-    <Key
-        latin:keySpec="&#x0D35;"
-        latin:moreKeys="&#x0D4D;&#x0D35;" />
-    <!-- U+0D36: "ശ" MALAYALAM LETTER SHA
-         U+0D37: "ഷ" MALAYALAM LETTER SSA
-         U+0D38: "സ" MALAYALAM LETTER SA -->
-    <Key
-        latin:keySpec="&#x0D36;"
-        latin:moreKeys="&#x0D37;,&#x0D38;" />
-    <!-- U+0D39: "ഹ" MALAYALAM LETTER HA
-         U+0D03: "ഃ" MALAYALAM SIGN VISARGA -->
-    <Key
-        latin:keySpec="&#x0D39;"
-        latin:moreKeys="&#x0D03;" />
-    <!-- U+0D33: "ള" MALAYALAM LETTER LLA
-         U+0D7E: "ൾ" MALAYALAM LETTER CHILLU LL
-         U+0D34: "ഴ" MALAYALAM LETTER LLLA -->
-    <Key
-        latin:keySpec="&#x0D33;"
-        latin:moreKeys="&#x0D7E;,&#x0D34;" />
-</merge>
diff --git a/java/res/xml/rowkeys_marathi1.xml b/java/res/xml/rowkeys_marathi1.xml
deleted file mode 100644
index b18042d2a..000000000
--- a/java/res/xml/rowkeys_marathi1.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2014, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <!-- Because the font rendering system prior to API version 16 can't automatically
-         render dotted circle for incomplete combining letter of some scripts, different
-         set of Key definitions are needed based on the API version. -->
-    <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_au" />
-    <!-- U+0967: "१" DEVANAGARI DIGIT ONE -->
-    <Key
-        latin:keyStyle="baseKeyDevanagariVowelSignAu"
-        latin:keyHintLabel="1"
-        latin:additionalMoreKeys="&#x0967;,1" />
-    <!-- Because the font rendering system prior to API version 16 can't automatically
-         render dotted circle for incomplete combining letter of some scripts, different
-         set of Key definitions are needed based on the API version. -->
-    <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_ai" />
-    <!-- U+0968: "२" DEVANAGARI DIGIT TWO -->
-    <Key
-        latin:keyStyle="baseKeyDevanagariVowelSignAi"
-        latin:keyHintLabel="2"
-        latin:additionalMoreKeys="&#x0968;,2" />
-    <!-- Because the font rendering system prior to API version 16 can't automatically
-         render dotted circle for incomplete combining letter of some scripts, different
-         set of Key definitions are needed based on the API version. -->
-    <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_aa" />
-    <!-- U+0969: "३" DEVANAGARI DIGIT THREE -->
-    <Key
-        latin:keyStyle="baseKeyDevanagariVowelSignAa"
-        latin:keyHintLabel="3"
-        latin:additionalMoreKeys="&#x0969;,3" />
-    <!-- Because the font rendering system prior to API version 16 can't automatically
-         render dotted circle for incomplete combining letter of some scripts, different
-         set of Key definitions are needed based on the API version. -->
-    <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_ii" />
-    <!-- U+096A: "४" DEVANAGARI DIGIT FOUR -->
-    <Key
-        latin:keyStyle="baseKeyDevanagariVowelSignIi"
-        latin:keyHintLabel="4"
-        latin:additionalMoreKeys="&#x096A;,4" />
-    <!-- Because the font rendering system prior to API version 16 can't automatically
-         render dotted circle for incomplete combining letter of some scripts, different
-         set of Key definitions are needed based on the API version. -->
-    <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_uu" />
-    <!-- U+096B: "५" DEVANAGARI DIGIT FIVE -->
-    <Key
-        latin:keyStyle="baseKeyDevanagariVowelSignUu"
-        latin:keyHintLabel="5"
-        latin:additionalMoreKeys="&#x096B;,5" />
-    <!-- U+092C: "ब" DEVANAGARI LETTER BA
-         U+092D: "भ" DEVANAGARI LETTER BHA
-         U+096C: "६" DEVANAGARI DIGIT SIX -->
-    <Key
-        latin:keySpec="&#x092C;"
-        latin:moreKeys="&#x092D;,%"
-        latin:keyHintLabel="6"
-        latin:additionalMoreKeys="&#x096C;,6" />
-    <!-- U+0939: "ह" DEVANAGARI LETTER HA
-         U+096D: "७" DEVANAGARI DIGIT SEVEN -->
-    <Key
-        latin:keySpec="&#x0939;"
-        latin:keyHintLabel="7"
-        latin:additionalMoreKeys="&#x096D;,7" />
-    <!-- U+0917: "ग" DEVANAGARI LETTER GA
-         U+0918: "घ" DEVANAGARI LETTER GHA
-         U+096E: "८" DEVANAGARI DIGIT EIGHT -->
-    <Key
-        latin:keySpec="&#x0917;"
-        latin:moreKeys="&#x0918;,%"
-        latin:keyHintLabel="8"
-        latin:additionalMoreKeys="&#x096E;,8" />
-    <!-- U+0926: "द" DEVANAGARI LETTER DA
-         U+0927: "ध" DEVANAGARI LETTER DHA
-         U+096F: "९" DEVANAGARI DIGIT NINE -->
-    <Key
-        latin:keySpec="&#x0926;"
-        latin:moreKeys="&#x0927;,%"
-        latin:keyHintLabel="9"
-        latin:additionalMoreKeys="&#x096F;,9" />
-    <!-- U+091C: "ज" DEVANAGARI LETTER JA
-         U+091D: "झ" DEVANAGARI LETTER JHA
-         U+091C/U+094D/U+091E: "ज्ञ" DEVANAGARI LETTER JA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER JHA -->
-    <Key
-        latin:keySpec="&#x091C;"
-        latin:moreKeys="&#x091D;,&#x091C;&#x094D;&#x091E;,%"
-        latin:keyHintLabel="0"
-        latin:additionalMoreKeys="&#x0966;,0" />
-    <!-- U+0921: "ड" DEVANAGARI LETTER DDA
-         U+0922: "ढ" DEVANAGARI LETTER DDHA -->
-    <Key
-        latin:keySpec="&#x0921;"
-        latin:moreKeys="&#x0922;" />
-</merge>
diff --git a/java/res/xml/rowkeys_marathi2.xml b/java/res/xml/rowkeys_marathi2.xml
deleted file mode 100644
index 7517c49a6..000000000
--- a/java/res/xml/rowkeys_marathi2.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2014, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <!-- Because the font rendering system prior to API version 16 can't automatically
-         render dotted circle for incomplete combining letter of some scripts, different
-         set of Key definitions are needed based on the API version. -->
-    <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_o" />
-    <Key latin:keyStyle="baseKeyDevanagariVowelSignO" />
-    <!-- Because the font rendering system prior to API version 16 can't automatically
-         render dotted circle for incomplete combining letter of some scripts, different
-         set of Key definitions are needed based on the API version. -->
-    <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_e" />
-    <Key latin:keyStyle="baseKeyDevanagariVowelSignE" />
-    <!-- Because the font rendering system prior to API version 16 can't automatically
-         render dotted circle for incomplete combining letter of some scripts, different
-         set of Key definitions are needed based on the API version. -->
-    <include latin:keyboardLayout="@xml/keystyle_devanagari_sign_virama" />
-    <Key latin:keyStyle="baseKeyDevanagariSignVirama" />
-    <!-- Because the font rendering system prior to API version 16 can't automatically
-         render dotted circle for incomplete combining letter of some scripts, different
-         set of Key definitions are needed based on the API version. -->
-    <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_i" />
-    <Key latin:keyStyle="baseKeyDevanagariVowelSignI" />
-    <!-- Because the font rendering system prior to API version 16 can't automatically
-         render dotted circle for incomplete combining letter of some scripts, different
-         set of Key definitions are needed based on the API version. -->
-    <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_u" />
-    <Key latin:keyStyle="baseKeyDevanagariVowelSignU" />
-    <!-- U+092A: "प" DEVANAGARI LETTER PA
-         U+092B: "फ" DEVANAGARI LETTER PHA -->
-    <Key
-        latin:keySpec="&#x092A;"
-        latin:moreKeys="&#x092B;" />
-    <!-- Because the font rendering system prior to API version 16 can't automatically
-         render dotted circle for incomplete combining letter of some scripts, different
-         set of Key definitions are needed based on the API version. -->
-    <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_vocalic_r" />
-    <!-- U+0930: "र" DEVANAGARI LETTER RA -->
-    <Key
-        latin:keySpec="&#x0930;"
-        latin:keyStyle="moreKeysDevanagariVowelSignVocalicR" />
-    <!-- U+0915: "क" DEVANAGARI LETTER KA
-         U+0916: "ख" DEVANAGARI LETTER KHA -->
-    <Key
-        latin:keySpec="&#x0915;"
-        latin:moreKeys="&#x0916;" />
-    <!-- U+0924: "त" DEVANAGARI LETTER TA
-         U+0925: "थ" DEVANAGARI LETTER THA
-         U+0924/U+094D/U+0930: "त्र" DEVANAGARI LETTER TA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER RA -->
-    <Key
-        latin:keySpec="&#x0924;"
-        latin:moreKeys="&#x0925;,&#x0924;&#x094D;&#x0930;" />
-    <!-- U+091A: "च" DEVANAGARI LETTER CA
-         U+091B: "छ" DEVANAGARI LETTER CHA -->
-    <Key
-        latin:keySpec="&#x091A;"
-        latin:moreKeys="&#x091B;" />
-    <!-- U+091F: "ट" DEVANAGARI LETTER TTA
-         U+0920: "ठ" DEVANAGARI LETTER TTHA -->
-    <Key
-        latin:keySpec="&#x091F;"
-        latin:moreKeys="&#x0920;" />
-</merge>
diff --git a/java/res/xml/rowkeys_marathi3.xml b/java/res/xml/rowkeys_marathi3.xml
deleted file mode 100644
index 9529ba1fa..000000000
--- a/java/res/xml/rowkeys_marathi3.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2014, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <!-- Because the font rendering system prior to API version 16 can't automatically
-         render dotted circle for incomplete combining letter of some scripts, different
-         set of Key definitions are needed based on the API version. -->
-    <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_candra_o" />
-    <Key latin:keyStyle="baseKeyDevanagariVowelSignCandraO" />
-    <!-- Because the font rendering system prior to API version 16 can't automatically
-         render dotted circle for incomplete combining letter of some scripts, different
-         set of Key definitions are needed based on the API version. -->
-    <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_candra_e" />
-    <Key latin:keyStyle="baseKeyDevanagariVowelSignCandraE" />
-    <!-- Because the font rendering system prior to API version 16 can't automatically
-         render dotted circle for incomplete combining letter of some scripts, different
-         set of Key definitions are needed based on the API version. -->
-    <include latin:keyboardLayout="@xml/keystyle_devanagari_sign_anusvara" />
-    <Key latin:keyStyle="baseKeyDevanagariSignAnusvara" />
-    <!-- U+092E: "म" DEVANAGARI LETTER MA -->
-    <Key latin:keySpec="&#x092E;" />
-    <!-- U+0928: "न" DEVANAGARI LETTER NA
-         U+0923: "ण" DEVANAGARI LETTER NNA
-         U+091E: "ञ" DEVANAGARI LETTER NYA
-         U+0919: "ङ" DEVANAGARI LETTER NGA -->
-    <Key
-        latin:keySpec="&#x0928;"
-        latin:moreKeys="&#x0923;,&#x091E;,&#x0919;" />
-    <!-- U+0935: "व" DEVANAGARI LETTER VA -->
-    <Key latin:keySpec="&#x0935;" />
-    <!-- U+0932: "ल" DEVANAGARI LETTER LA
-         U+0933: "ळ" DEVANAGARI LETTER LLA -->
-    <Key
-        latin:keySpec="&#x0932;"
-        latin:moreKeys="&#x0933;" />
-    <!-- U+0938: "स" DEVANAGARI LETTER SA
-         U+0936: "श" DEVANAGARI LETTER SHA
-         U+0937: "ष" DEVANAGARI LETTER SSA
-         U+0936/U+094D/U+0930: "श्र" DEVANAGARI LETTER SHA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER RA -->
-    <Key
-        latin:keySpec="&#x0938;"
-        latin:moreKeys="&#x0936;,&#x0937;,&#x0936;&#x094D;&#x0930;" />
-    <!-- U+092F: "य" DEVANAGARI LETTER YA -->
-    <Key latin:keySpec="&#x092F;" />
-    <!-- U+0915/U+094D/U+0937: "क्ष" DEVANAGARI LETTER KA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER SSA -->
-    <Key
-        latin:keySpec="&#x0915;&#x094D;&#x0937;"
-        latin:keyLabelFlags="followKeyLetterRatio" />
-</merge>
diff --git a/java/res/xml/rowkeys_mongolian1.xml b/java/res/xml/rowkeys_mongolian1.xml
deleted file mode 100644
index 14108b404..000000000
--- a/java/res/xml/rowkeys_mongolian1.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <!-- U+0444: "ф" CYRILLIC SMALL LETTER EF -->
-    <Key
-        latin:keySpec="&#x0444;"
-        latin:keyHintLabel="1"
-        latin:additionalMoreKeys="1" />
-    <!-- U+0446: "ц" CYRILLIC SMALL LETTER TSE -->
-    <Key
-        latin:keySpec="&#x0446;"
-        latin:keyHintLabel="2"
-        latin:additionalMoreKeys="2" />
-    <!-- U+0443: "у" CYRILLIC SMALL LETTER U -->
-    <Key
-        latin:keySpec="&#x0443;"
-        latin:keyHintLabel="3"
-        latin:additionalMoreKeys="3"
-        latin:moreKeys="!text/morekeys_cyrillic_u" />
-    <!-- U+0436: "ж" CYRILLIC SMALL LETTER ZHE -->
-    <Key
-        latin:keySpec="&#x0436;"
-        latin:keyHintLabel="4"
-        latin:additionalMoreKeys="4" />
-    <!-- U+044D: "э" CYRILLIC SMALL LETTER E -->
-    <Key
-        latin:keySpec="&#x044D;"
-        latin:keyHintLabel="5"
-        latin:additionalMoreKeys="5"
-        latin:moreKeys="!text/morekeys_cyrillic_ie" />
-    <!-- U+043D: "н" CYRILLIC SMALL LETTER EN -->
-    <Key
-        latin:keySpec="&#x043D;"
-        latin:keyHintLabel="6"
-        latin:additionalMoreKeys="6"
-        latin:moreKeys="!text/morekeys_cyrillic_en" />
-    <!-- U+0433: "г" CYRILLIC SMALL LETTER GHE -->
-    <Key
-        latin:keySpec="&#x0433;"
-        latin:keyHintLabel="7"
-        latin:additionalMoreKeys="7"
-        latin:moreKeys="!text/morekeys_cyrillic_ghe" />
-    <!-- U+0448: "ш" CYRILLIC SMALL LETTER SHA
-         U+0449: "щ" CYRILLIC SMALL LETTER SHCHA -->
-    <Key
-        latin:keySpec="&#x0448;"
-        latin:keyHintLabel="8"
-        latin:additionalMoreKeys="8"
-        latin:moreKeys="&#x0449;" />
-    <!-- U+04AF: "ү" CYRILLIC SMALL LETTER STRAIGHT U -->
-    <Key
-        latin:keySpec="&#x04AF;"
-        latin:keyHintLabel="9"
-        latin:additionalMoreKeys="9" />
-    <!-- U+0437: "з" CYRILLIC SMALL LETTER ZE -->
-    <Key
-        latin:keySpec="&#x0437;"
-        latin:keyHintLabel="0"
-        latin:additionalMoreKeys="0" />
-    <!-- U+043A: "к" CYRILLIC SMALL LETTER KA -->
-    <Key
-        latin:keySpec="&#x043A;" />
-</merge>
diff --git a/java/res/xml/rowkeys_mongolian2.xml b/java/res/xml/rowkeys_mongolian2.xml
deleted file mode 100644
index 3426771a3..000000000
--- a/java/res/xml/rowkeys_mongolian2.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <!-- U+0439: "й" CYRILLIC SMALL LETTER SHORT I -->
-    <Key
-        latin:keySpec="&#x0439;" />
-    <!-- U+044B: "ы" CYRILLIC SMALL LETTER YERU -->
-    <Key
-        latin:keySpec="&#x044B;" />
-    <!-- U+0431: "б" CYRILLIC SMALL LETTER BE -->
-    <Key
-        latin:keySpec="&#x0431;" />
-    <!-- U+04E9: "ө" CYRILLIC SMALL LETTER BARRED O -->
-    <Key
-        latin:keySpec="&#x04E9;" />
-    <!-- U+0430: "а" CYRILLIC SMALL LETTER A -->
-    <Key
-        latin:keySpec="&#x0430;" />
-    <!-- U+0445: "х" CYRILLIC SMALL LETTER HA -->
-    <Key
-        latin:keySpec="&#x0445;" />
-    <!-- U+0440: "р" CYRILLIC SMALL LETTER ER -->
-    <Key
-        latin:keySpec="&#x0440;" />
-    <!-- U+043E: "о" CYRILLIC SMALL LETTER O -->
-    <Key
-        latin:keySpec="&#x043E;" />
-    <!-- U+043B: "л" CYRILLIC SMALL LETTER EL -->
-    <Key
-        latin:keySpec="&#x043B;" />
-    <!-- U+0434: "д" CYRILLIC SMALL LETTER DE -->
-    <Key
-        latin:keySpec="&#x0434;" />
-    <!-- U+043F: "п" CYRILLIC SMALL LETTER PE -->
-    <Key
-        latin:keySpec="&#x043F;" />
-</merge>
diff --git a/java/res/xml/rowkeys_mongolian3.xml b/java/res/xml/rowkeys_mongolian3.xml
deleted file mode 100644
index 5300b2ce4..000000000
--- a/java/res/xml/rowkeys_mongolian3.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <!-- U+044F: "я" CYRILLIC SMALL LETTER YA -->
-    <Key
-        latin:keySpec="&#x044F;" />
-    <!-- U+0447: "ч" CYRILLIC SMALL LETTER CHE -->
-    <Key
-        latin:keySpec="&#x0447;" />
-    <!-- U+0451: "ё" CYRILLIC SMALL LETTER IO
-         U+0435: "е" CYRILLIC SMALL LETTER IE -->
-    <Key
-        latin:keySpec="&#x0451;"
-        latin:moreKeys="&#x0435;" />
-    <!-- U+0441: "с" CYRILLIC SMALL LETTER ES -->
-    <Key
-        latin:keySpec="&#x0441;" />
-    <!-- U+043C: "м" CYRILLIC SMALL LETTER EM -->
-    <Key
-        latin:keySpec="&#x043C;" />
-    <!-- U+0438: "и" CYRILLIC SMALL LETTER I -->
-    <Key
-        latin:keySpec="&#x0438;" />
-    <!-- U+0442: "т" CYRILLIC SMALL LETTER TE -->
-    <Key
-        latin:keySpec="&#x0442;" />
-    <!-- U+044C: "ь" CYRILLIC SMALL LETTER SOFT SIGN
-         U+044A: "ъ" CYRILLIC SMALL LETTER HARD SIGN -->
-    <Key
-        latin:keySpec="&#x044C;"
-        latin:moreKeys="&#x044A;" />
-    <!-- U+0432: "в" CYRILLIC SMALL LETTER VE
-         U+044E: "ю" CYRILLIC SMALL LETTER YU -->
-    <Key
-        latin:keySpec="&#x0432;"
-        latin:moreKeys="&#x044E;" />
-</merge>
diff --git a/java/res/xml/rowkeys_nepali_romanized1.xml b/java/res/xml/rowkeys_nepali_romanized1.xml
deleted file mode 100644
index b471f5dd5..000000000
--- a/java/res/xml/rowkeys_nepali_romanized1.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2013, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <switch>
-        <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
-            <!-- U+0920: "ठ" DEVANAGARI LETTER TTHA -->
-            <Key latin:keySpec="&#x0920;" />
-            <!-- U+0914: "औ" DEVANAGARI LETTER AU -->
-            <Key latin:keySpec="&#x0914;" />
-            <!-- Because the font rendering system prior to API version 16 can't automatically
-                 render dotted circle for incomplete combining letter of some scripts, different
-                 set of Key definitions are needed based on the API version. -->
-            <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_ai" />
-            <Key latin:keyStyle="baseKeyDevanagariVowelSignAi" />
-            <!-- Because the font rendering system prior to API version 16 can't automatically
-                 render dotted circle for incomplete combining letter of some scripts, different
-                 set of Key definitions are needed based on the API version. -->
-            <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_vocalic_r" />
-            <Key latin:keyStyle="baseKeyDevanagariVowelSignVocalicR" />
-            <!-- U+0925: "थ" DEVANAGARI LETTER THA -->
-            <Key latin:keySpec="&#x0925;" />
-            <!-- U+091E: "ञ" DEVANAGARI LETTER NYA -->
-            <Key latin:keySpec="&#x091E;" />
-            <!-- Because the font rendering system prior to API version 16 can't automatically
-                 render dotted circle for incomplete combining letter of some scripts, different
-                 set of Key definitions are needed based on the API version. -->
-            <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_uu" />
-            <Key latin:keyStyle="baseKeyDevanagariVowelSignUu" />
-            <!-- Because the font rendering system prior to API version 16 can't automatically
-                 render dotted circle for incomplete combining letter of some scripts, different
-                 set of Key definitions are needed based on the API version. -->
-            <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_ii" />
-            <Key latin:keyStyle="baseKeyDevanagariVowelSignIi" />
-            <!-- U+0913: "ओ" DEVANAGARI LETTER O -->
-            <Key latin:keySpec="&#x0913;" />
-            <!-- U+092B: "फ" DEVANAGARI LETTER PHA -->
-            <Key latin:keySpec="&#x092B;" />
-            <!-- U+0908: "ई" DEVANAGARI LETTER II -->
-            <Key latin:keySpec="&#x0908;" />
-        </case>
-        <default>
-            <!-- Because the font rendering system prior to API version 16 can't automatically
-                 render dotted circle for incomplete combining letter of some scripts, different
-                 set of Key definitions are needed based on the API version. -->
-            <include latin:keyboardLayout="@xml/keystyle_devanagari_sign_nukta" />
-            <!-- U+091F: "ट" DEVANAGARI LETTER TTA
-                 U+0967: "१" DEVANAGARI DIGIT ONE -->
-            <Key
-                latin:keySpec="&#x091F;"
-                latin:keyHintLabel="1"
-                latin:additionalMoreKeys="&#x0967;,1"
-                latin:keyStyle="moreKeysDevanagariSignNukta" />
-            <!-- Because the font rendering system prior to API version 16 can't automatically
-                 render dotted circle for incomplete combining letter of some scripts, different
-                 set of Key definitions are needed based on the API version. -->
-            <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_au" />
-            <!-- U+0968: "२" DEVANAGARI DIGIT TWO -->
-            <Key
-                latin:keyStyle="baseKeyDevanagariVowelSignAu"
-                latin:keyHintLabel="2"
-                latin:additionalMoreKeys="&#x0968;,2" />
-            <!-- Because the font rendering system prior to API version 16 can't automatically
-                 render dotted circle for incomplete combining letter of some scripts, different
-                 set of Key definitions are needed based on the API version. -->
-            <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_e" />
-            <!-- U+0969: "३" DEVANAGARI DIGIT THREE -->
-            <Key
-                latin:keyStyle="baseKeyDevanagariVowelSignE"
-                latin:keyHintLabel="3"
-                latin:additionalMoreKeys="&#x0969;,3" />
-            <!-- U+0930: "र" DEVANAGARI LETTER RA
-                 U+096A: "४" DEVANAGARI DIGIT FOUR -->
-            <Key
-                latin:keySpec="&#x0930;"
-                latin:keyHintLabel="4"
-                latin:additionalMoreKeys="&#x096A;,4" />
-            <!-- U+0924: "त" DEVANAGARI LETTER TA
-                 U+096B: "५" DEVANAGARI DIGIT FIVE -->
-            <Key
-                latin:keySpec="&#x0924;"
-                latin:keyHintLabel="5"
-                latin:additionalMoreKeys="&#x096B;,5" />
-            <!-- U+092F: "य" DEVANAGARI LETTER YA
-                 U+096C: "६" DEVANAGARI DIGIT SIX -->
-            <Key
-                latin:keySpec="&#x092F;"
-                latin:keyHintLabel="6"
-                latin:additionalMoreKeys="&#x096C;,6" />
-            <!-- Because the font rendering system prior to API version 16 can't automatically
-                 render dotted circle for incomplete combining letter of some scripts, different
-                 set of Key definitions are needed based on the API version. -->
-            <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_u" />
-            <!-- U+096D: "७" DEVANAGARI DIGIT SEVEN -->
-            <Key
-                latin:keyStyle="baseKeyDevanagariVowelSignU"
-                latin:keyHintLabel="7"
-                latin:additionalMoreKeys="&#x096D;,7" />
-            <!-- Because the font rendering system prior to API version 16 can't automatically
-                 render dotted circle for incomplete combining letter of some scripts, different
-                 set of Key definitions are needed based on the API version. -->
-            <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_i" />
-            <!-- U+096E: "८" DEVANAGARI DIGIT EIGHT -->
-            <Key
-                latin:keyStyle="baseKeyDevanagariVowelSignI"
-                latin:keyHintLabel="8"
-                latin:additionalMoreKeys="&#x096E;,8" />
-            <!-- Because the font rendering system prior to API version 16 can't automatically
-                 render dotted circle for incomplete combining letter of some scripts, different
-                 set of Key definitions are needed based on the API version. -->
-            <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_o" />
-            <!-- U+096F: "९" DEVANAGARI DIGIT NINE -->
-            <Key
-                latin:keyStyle="baseKeyDevanagariVowelSignO"
-                latin:keyHintLabel="9"
-                latin:additionalMoreKeys="&#x096F;,9" />
-            <!-- U+092A: "प" DEVANAGARI LETTER PA
-                 U+0966: "०" DEVANAGARI DIGIT ZERO -->
-            <Key
-                latin:keySpec="&#x092A;"
-                latin:keyHintLabel="0"
-                latin:additionalMoreKeys="&#x0966;,0" />
-            <!-- U+0907: "इ" DEVANAGARI LETTER I -->
-            <Key latin:keySpec="&#x0907;" />
-        </default>
-    </switch>
-</merge>
diff --git a/java/res/xml/rowkeys_nepali_romanized2.xml b/java/res/xml/rowkeys_nepali_romanized2.xml
deleted file mode 100644
index 2f3ee14c2..000000000
--- a/java/res/xml/rowkeys_nepali_romanized2.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2013, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <switch>
-        <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
-            <!-- U+0906: "आ" DEVANAGARI LETTER AA -->
-            <Key latin:keySpec="&#x0906;" />
-            <!-- U+0936: "श" DEVANAGARI LETTER SHA -->
-            <Key latin:keySpec="&#x0936;" />
-            <!-- U+0927: "ध" DEVANAGARI LETTER DHA -->
-            <Key latin:keySpec="&#x0927;" />
-            <!-- U+090A: "ऊ" DEVANAGARI LETTER UU -->
-            <Key latin:keySpec="&#x090A;" />
-            <!-- U+0918: "घ" DEVANAGARI LETTER GHA -->
-            <Key latin:keySpec="&#x0918;" />
-            <!-- U+0905: "अ" DEVANAGARI LETTER A -->
-            <Key latin:keySpec="&#x0905;" />
-            <!-- U+091D: "झ" DEVANAGARI LETTER JHA -->
-            <Key latin:keySpec="&#x091D;" />
-            <!-- U+0916: "ख" DEVANAGARI LETTER KHA -->
-            <Key latin:keySpec="&#x0916;" />
-            <!-- U+0965: "॥" DEVANAGARI DOUBLE DANDA -->
-            <Key latin:keySpec="&#x0965;" />
-            <!-- U+0910: "ऐ" DEVANAGARI LETTER AI -->
-            <Key latin:keySpec="&#x0910;" />
-            <!-- Because the font rendering system prior to API version 16 can't automatically
-                 render dotted circle for incomplete combining letter of some scripts, different
-                 set of Key definitions are needed based on the API version. -->
-            <include latin:keyboardLayout="@xml/keystyle_devanagari_sign_visarga" />
-            <Key latin:keyStyle="baseKeyDevanagariSignVisarga" />
-        </case>
-        <default>
-            <!-- Because the font rendering system prior to API version 16 can't automatically
-                 render dotted circle for incomplete combining letter of some scripts, different
-                 set of Key definitions are needed based on the API version. -->
-            <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_aa" />
-            <Key latin:keyStyle="baseKeyDevanagariVowelSignAa" />
-            <!-- U+0938: "स" DEVANAGARI LETTER SA -->
-            <Key latin:keySpec="&#x0938;" />
-            <!-- U+0926: "द" DEVANAGARI LETTER DA -->
-            <Key latin:keySpec="&#x0926;" />
-            <!-- U+0909: "उ" DEVANAGARI LETTER U -->
-            <Key latin:keySpec="&#x0909;" />
-            <!-- U+0917: "ग" DEVANAGARI LETTER GA -->
-            <Key latin:keySpec="&#x0917;" />
-            <!-- U+0939: "ह" DEVANAGARI LETTER HA -->
-            <Key latin:keySpec="&#x0939;" />
-            <!-- U+091C: "ज" DEVANAGARI LETTER JA -->
-            <Key latin:keySpec="&#x091C;" />
-            <!-- U+0915: "क" DEVANAGARI LETTER KA -->
-            <Key latin:keySpec="&#x0915;" />
-            <!-- U+0932: "ल" DEVANAGARI LETTER LA -->
-            <Key latin:keySpec="&#x0932;" />
-            <!-- U+090F: "ए" DEVANAGARI LETTER E -->
-            <Key latin:keySpec="&#x090F;" />
-            <!-- U+0950: "ॐ" DEVANAGARI OM -->
-            <Key latin:keySpec="&#x0950;" />
-        </default>
-    </switch>
-</merge>
diff --git a/java/res/xml/rowkeys_nepali_romanized3.xml b/java/res/xml/rowkeys_nepali_romanized3.xml
deleted file mode 100644
index 552c9a989..000000000
--- a/java/res/xml/rowkeys_nepali_romanized3.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2013, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <switch>
-        <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
-            <!-- U+090B: "ऋ" DEVANAGARI LETTER VOCALIC R -->
-            <Key latin:keySpec="&#x090B;" />
-            <!-- U+0922: "ढ" DEVANAGARI LETTER DDHA -->
-            <Key latin:keySpec="&#x0922;" />
-            <!-- U+091B: "छ" DEVANAGARI LETTER CHA -->
-            <Key latin:keySpec="&#x091B;" />
-            <!-- Because the font rendering system prior to API version 16 can't automatically
-                 render dotted circle for incomplete combining letter of some scripts, different
-                 set of Key definitions are needed based on the API version. -->
-            <include latin:keyboardLayout="@xml/keystyle_devanagari_sign_candrabindu" />
-            <Key latin:keyStyle="baseKeyDevanagariSignCandrabindu" />
-            <!-- U+092D: "भ" DEVANAGARI LETTER BHA -->
-            <Key latin:keySpec="&#x092D;" />
-            <!-- U+0923: "ण" DEVANAGARI LETTER NNA -->
-            <Key latin:keySpec="&#x0923;" />
-            <!-- Because the font rendering system prior to API version 16 can't automatically
-                 render dotted circle for incomplete combining letter of some scripts, different
-                 set of Key definitions are needed based on the API version. -->
-            <include latin:keyboardLayout="@xml/keystyle_devanagari_sign_anusvara" />
-            <Key latin:keyStyle="baseKeyDevanagariSignAnusvara" />
-            <!-- U+0919: "ङ" DEVANAGARI LETTER NGA -->
-            <Key latin:keySpec="&#x0919;" />
-        </case>
-        <default>
-            <!-- U+0937: "ष" DEVANAGARI LETTER SSA -->
-            <Key latin:keySpec="&#x0937;" />
-            <!-- U+0921: "ड" DEVANAGARI LETTER DDA -->
-            <Key latin:keySpec="&#x0921;" />
-            <!-- U+091A: "च" DEVANAGARI LETTER CA -->
-            <Key latin:keySpec="&#x091A;" />
-            <!-- U+0935: "व" DEVANAGARI LETTER VA -->
-            <Key latin:keySpec="&#x0935;" />
-            <!-- U+092C: "ब" DEVANAGARI LETTER BHA -->
-            <Key latin:keySpec="&#x092C;" />
-            <!-- U+0928: "न" DEVANAGARI LETTER NA -->
-            <Key latin:keySpec="&#x0928;" />
-            <!-- U+092E: "म" DEVANAGARI LETTER MA -->
-            <Key latin:keySpec="&#x092E;" />
-            <!-- Because the font rendering system prior to API version 16 can't automatically
-                 render dotted circle for incomplete combining letter of some scripts, different
-                 set of Key definitions are needed based on the API version. -->
-            <include latin:keyboardLayout="@xml/keystyle_devanagari_sign_virama" />
-            <!-- U+093D: "ऽ" DEVANAGARI SIGN AVAGRAHA -->
-            <Key
-                latin:keyStyle="baseKeyDevanagariSignVirama"
-                latin:moreKeys="&#x093D;" />
-        </default>
-    </switch>
-</merge>
diff --git a/java/res/xml/rowkeys_nepali_traditional1.xml b/java/res/xml/rowkeys_nepali_traditional1.xml
deleted file mode 100644
index 761590697..000000000
--- a/java/res/xml/rowkeys_nepali_traditional1.xml
+++ /dev/null
@@ -1,156 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2013, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <switch>
-        <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
-            <!-- U+0924/U+094D/U+0924: "त्त" DEVANAGARI LETTER TA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER TA
-                 U+091E: "ञ" DEVANAGARI LETTER NYA
-                 U+091C/U+094D/U+091E: "ज्ञ" DEVANAGARI LETTER JA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER NYA
-                 U+0965: "॥" DEVANAGARI DOUBLE DANDA -->
-            <Key
-                latin:keySpec="&#x0924;&#x094D;&#x0924;"
-                latin:moreKeys="&#x091E;,&#x091C;&#x094D;&#x091E;,&#x0965;"
-                latin:keyLabelFlags="followKeyLetterRatio" />
-            <!-- U+0921/U+094D/U+0922: "ड्ढ" DEVANAGARI LETTER DDA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER DDHA
-                 U+0908: "ई" DEVANAGARI LETTER II -->
-            <Key
-                latin:keySpec="&#x0921;&#x094D;&#x0922;"
-                latin:moreKeys="&#x0908;"
-                latin:keyLabelFlags="followKeyLetterRatio" />
-            <!-- U+0910: "ऐ" DEVANAGARI LETTER AI
-                 U+0918: "घ" DEVANAGARI LETTER GHA -->
-            <Key
-                latin:keySpec="&#x0910;"
-                latin:moreKeys="&#x0918;" />
-            <!-- U+0926/U+094D/U+0935: "द्व" DEVANAGARI LETTER DA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER VA
-                 U+0926/U+094D/U+0927: "द्ध" DEVANAGARI LETTER DA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER DHA -->
-            <Key
-                latin:keySpec="&#x0926;&#x094D;&#x0935;"
-                latin:moreKeys="&#x0926;&#x094D;&#x0927;"
-                latin:keyLabelFlags="followKeyLetterRatio" />
-            <!-- U+091F/U+094D/U+091F: "ट्ट" DEVANAGARI LETTER TTA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER TTA
-                 U+091B: "छ" DEVANAGARI LETTER CHA -->
-            <Key
-                latin:keySpec="&#x091F;&#x094D;&#x091F;"
-                latin:moreKeys="&#x091B;"
-                latin:keyLabelFlags="followKeyLetterRatio" />
-            <!-- U+0920/U+094D/U+0920: "ठ्ठ" DEVANAGARI LETTER TTHA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER TTHA
-                 U+091F: "ट" DEVANAGARI LETTER TTA -->
-            <Key
-                latin:keySpec="&#x0920;&#x094D;&#x0920;"
-                latin:moreKeys="&#x091F;"
-                latin:keyLabelFlags="followKeyLetterRatio" />
-            <!-- U+090A: "ऊ" DEVANAGARI LETTER UU
-                 U+0920: "ठ" DEVANAGARI LETTER TTHA -->
-            <Key
-                latin:keySpec="&#x090A;"
-                latin:moreKeys="&#x0920;" />
-            <!-- U+0915/U+094D/U+0937: "क्ष" DEVANAGARI LETTER KA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER SSA
-                 U+0921: "ड" DEVANAGARI LETTER DDA -->
-            <Key
-                latin:keySpec="&#x0915;&#x094D;&#x0937;"
-                latin:moreKeys="&#x0921;"
-                latin:keyLabelFlags="followKeyLetterRatio" />
-            <!-- U+0907: "इ" DEVANAGARI LETTER I
-                 U+0922: "ढ" DEVANAGARI LETTER DDHA -->
-            <Key
-                latin:keySpec="&#x0907;"
-                latin:moreKeys="&#x0922;" />
-            <!-- U+090F: "ए" DEVANAGARI LETTER E
-                 U+0923: "ण" DEVANAGARI LETTER NNA -->
-            <Key
-                latin:keySpec="&#x090F;"
-                latin:moreKeys="&#x0923;" />
-            <!-- Because the font rendering system prior to API version 16 can't automatically
-                 render dotted circle for incomplete combining letter of some scripts, different
-                 set of Key definitions are needed based on the API version. -->
-            <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_vocalic_r" />
-            <Key latin:keyStyle="baseKeyDevanagariVowelSignVocalicR" />
-        </case>
-        <default>
-            <!-- U+091F: "ट" DEVANAGARI LETTER TTA
-                 U+0967: "१" DEVANAGARI DIGIT ONE -->
-            <Key
-                latin:keySpec="&#x091F;"
-                latin:keyHintLabel="1"
-                latin:additionalMoreKeys="&#x0967;,1" />
-            <!-- U+0927: "ध" DEVANAGARI LETTER DHA
-                 U+0968: "२" DEVANAGARI DIGIT TWO -->
-            <Key
-                latin:keySpec="&#x0927;"
-                latin:keyHintLabel="2"
-                latin:additionalMoreKeys="&#x0968;,2" />
-            <!-- U+092D: "भ" DEVANAGARI LETTER BHA
-                 U+0969: "३" DEVANAGARI DIGIT THREE -->
-            <Key
-                latin:keySpec="&#x092D;"
-                latin:keyHintLabel="3"
-                latin:additionalMoreKeys="&#x0969;,3" />
-            <!-- U+091A: "च" DEVANAGARI LETTER CA
-                 U+096A: "४" DEVANAGARI DIGIT FOUR -->
-            <Key
-                latin:keySpec="&#x091A;"
-                latin:keyHintLabel="4"
-                latin:additionalMoreKeys="&#x096A;,4" />
-            <!-- U+0924: "त" DEVANAGARI LETTER TA
-                 U+096B: "५" DEVANAGARI DIGIT FIVE -->
-            <Key
-                latin:keySpec="&#x0924;"
-                latin:keyHintLabel="5"
-                latin:additionalMoreKeys="&#x096B;,5" />
-            <!-- U+0925: "थ" DEVANAGARI LETTER THA
-                 U+096C: "६" DEVANAGARI DIGIT SIX -->
-            <Key
-                latin:keySpec="&#x0925;"
-                latin:keyHintLabel="6"
-                latin:additionalMoreKeys="&#x096C;,6" />
-            <!-- U+0917: "ग" DEVANAGARI LETTER G
-                 U+096D: "७" DEVANAGARI DIGIT SEVEN -->
-            <Key
-                latin:keySpec="&#x0917;"
-                latin:keyHintLabel="7"
-                latin:additionalMoreKeys="&#x096D;,7" />
-            <!-- U+0937: "ष" DEVANAGARI LETTER SSA
-                 U+096E: "८" DEVANAGARI DIGIT EIGHT -->
-            <Key
-                latin:keySpec="&#x0937;"
-                latin:keyHintLabel="8"
-                latin:additionalMoreKeys="&#x096E;,8" />
-            <!-- U+092F: "य" DEVANAGARI LETTER YA
-                 U+096F: "९" DEVANAGARI DIGIT NINE -->
-            <Key
-                latin:keySpec="&#x092F;"
-                latin:keyHintLabel="9"
-                latin:additionalMoreKeys="&#x096F;,9" />
-            <!-- U+0909: "उ" DEVANAGARI LETTER U
-                 U+0966: "०" DEVANAGARI DIGIT ZERO -->
-            <Key
-                latin:keySpec="&#x0909;"
-                latin:keyHintLabel="0"
-                latin:additionalMoreKeys="&#x0966;,0" />
-            <!-- U+0907: "इ" DEVANAGARI LETTER I
-                 U+0914: "औ" DEVANAGARI LETTER AU -->
-            <Key
-                latin:keySpec="&#x0907;"
-                latin:moreKeys="&#x0914;" />
-        </default>
-    </switch>
-</merge>
diff --git a/java/res/xml/rowkeys_nepali_traditional2.xml b/java/res/xml/rowkeys_nepali_traditional2.xml
deleted file mode 100644
index d55692dea..000000000
--- a/java/res/xml/rowkeys_nepali_traditional2.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2013, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <switch>
-        <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
-            <!-- U+0906: "आ" DEVANAGARI LETTER AA -->
-            <Key latin:keySpec="&#x0906;" />
-            <!-- U+0919/U+094D: "ङ्" DEVANAGARI LETTER NGA/DEVANAGARI SIGN VIRAMA -->
-            <Key
-                latin:keySpec="&#x0919;&#x094D;"
-                latin:keyLabelFlags="followKeyLetterRatio" />
-            <!-- U+0921/U+094D/U+0921: "ड्ड" DEVANAGARI LETTER DDA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER DDA -->
-            <Key
-                latin:keySpec="&#x0921;&#x094D;&#x0921;"
-                latin:keyLabelFlags="followKeyLetterRatio" />
-            <!-- Because the font rendering system prior to API version 16 can't automatically
-                 render dotted circle for incomplete combining letter of some scripts, different
-                 set of Key definitions are needed based on the API version. -->
-            <include latin:keyboardLayout="@xml/keystyle_devanagari_sign_candrabindu" />
-            <Key latin:keyStyle="baseKeyDevanagariSignCandrabindu" />
-            <!-- U+0926/U+094D/U+0926: "द्द" DEVANAGARI LETTER DA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER DA -->
-            <Key
-                latin:keySpec="&#x0926;&#x094D;&#x0926;"
-                latin:keyLabelFlags="followKeyLetterRatio" />
-            <!-- U+091D: "झ" DEVANAGARI LETTER JHA -->
-            <Key latin:keySpec="&#x091D;" />
-            <!-- Because the font rendering system prior to API version 16 can't automatically
-                 render dotted circle for incomplete combining letter of some scripts, different
-                 set of Key definitions are needed based on the API version. -->
-            <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_o" />
-            <Key latin:keyStyle="baseKeyDevanagariVowelSignO" />
-            <!-- U+092B: "फ" DEVANAGARI LETTER PHA -->
-            <Key latin:keySpec="&#x092B;" />
-            <!-- Because the font rendering system prior to API version 16 can't automatically
-                 render dotted circle for incomplete combining letter of some scripts, different
-                 set of Key definitions are needed based on the API version. -->
-            <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_ii" />
-            <Key latin:keyStyle="baseKeyDevanagariVowelSignIi" />
-            <!-- U+091F/U+094D/U+0920: "ट्ठ" DEVANAGARI LETTER TTA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER TTHA -->
-            <Key
-                latin:keySpec="&#x091F;&#x094D;&#x0920;"
-                latin:keyLabelFlags="followKeyLetterRatio" />
-            <!-- Because the font rendering system prior to API version 16 can't automatically
-                 render dotted circle for incomplete combining letter of some scripts, different
-                 set of Key definitions are needed based on the API version. -->
-            <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_uu" />
-            <Key latin:keyStyle="baseKeyDevanagariVowelSignUu" />
-        </case>
-        <default>
-            <!-- U+092C: "ब" DEVANAGARI LETTER BA -->
-            <Key latin:keySpec="&#x092C;" />
-            <!-- U+0915: "क" DEVANAGARI LETTER KA -->
-            <Key latin:keySpec="&#x0915;" />
-            <!-- U+092E: "म" DEVANAGARI LETTER MA -->
-            <Key latin:keySpec="&#x092E;" />
-            <!-- Because the font rendering system prior to API version 16 can't automatically
-                 render dotted circle for incomplete combining letter of some scripts, different
-                 set of Key definitions are needed based on the API version. -->
-            <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_aa" />
-            <Key latin:keyStyle="baseKeyDevanagariVowelSignAa" />
-            <!-- U+0928: "न" DEVANAGARI LETTER NA -->
-            <Key latin:keySpec="&#x0928;" />
-            <!-- U+091C: "ज" DEVANAGARI LETTER JA -->
-            <Key latin:keySpec="&#x091C;" />
-            <!-- U+0935: "व" DEVANAGARI LETTER VA -->
-            <Key latin:keySpec="&#x0935;" />
-            <!-- U+092A: "प" DEVANAGARI LETTER PA -->
-            <Key latin:keySpec="&#x092A;" />
-            <!-- Because the font rendering system prior to API version 16 can't automatically
-                 render dotted circle for incomplete combining letter of some scripts, different
-                 set of Key definitions are needed based on the API version. -->
-            <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_i" />
-            <Key latin:keyStyle="baseKeyDevanagariVowelSignI" />
-            <!-- U+0938: "स" DEVANAGARI LETTER SA -->
-            <Key latin:keySpec="&#x0938;" />
-            <!-- Because the font rendering system prior to API version 16 can't automatically
-                 render dotted circle for incomplete combining letter of some scripts, different
-                 set of Key definitions are needed based on the API version. -->
-            <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_u" />
-            <Key latin:keyStyle="baseKeyDevanagariVowelSignU" />
-        </default>
-    </switch>
-</merge>
diff --git a/java/res/xml/rowkeys_nepali_traditional3.xml b/java/res/xml/rowkeys_nepali_traditional3.xml
deleted file mode 100644
index 1057aac05..000000000
--- a/java/res/xml/rowkeys_nepali_traditional3.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2013, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <switch>
-        <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
-            <!-- U+0915/U+094D: "क्" DEVANAGARI LETTER KA/DEVANAGARI SIGN VIRAMA -->
-            <Key
-                latin:keySpec="&#x0915;&#x094D;"
-                latin:keyLabelFlags="followKeyLetterRatio" />
-            <!-- U+0939/U+094D/U+092E: "ह्म" DEVANAGARI LETTER HA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER MA -->
-            <Key
-                latin:keySpec="&#x0939;&#x094D;&#x092E;"
-                latin:keyLabelFlags="followKeyLetterRatio" />
-            <!-- U+090B: "ऋ" DEVANAGARI LETTER VOCALIC R -->
-            <Key latin:keySpec="&#x090B;" />
-            <!-- U+0950: "ॐ" DEVANAGARI OM -->
-            <Key latin:keySpec="&#x0950;" />
-            <!-- Because the font rendering system prior to API version 16 can't automatically
-                 render dotted circle for incomplete combining letter of some scripts, different
-                 set of Key definitions are needed based on the API version. -->
-            <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_au" />
-            <Key latin:keyStyle="baseKeyDevanagariVowelSignAu" />
-            <!-- U+0926/U+094D/U+092F: "द्य" DEVANAGARI LETTER DA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER YA -->
-            <Key
-                latin:keySpec="&#x0926;&#x094D;&#x092F;"
-                latin:keyLabelFlags="followKeyLetterRatio" />
-            <!-- Because the font rendering system prior to API version 16 can't automatically
-                 render dotted circle for incomplete combining letter of some scripts, different
-                 set of Key definitions are needed based on the API version. -->
-            <include latin:keyboardLayout="@xml/keystyle_devanagari_sign_anusvara" />
-            <Key latin:keyStyle="baseKeyDevanagariSignAnusvara" />
-            <!-- U+0919: "ङ" DEVANAGARI LETTER NGA -->
-            <Key latin:keySpec="&#x0919;" />
-            <!-- Because the font rendering system prior to API version 16 can't automatically
-                 render dotted circle for incomplete combining letter of some scripts, different
-                 set of Key definitions are needed based on the API version. -->
-            <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_ai" />
-            <Key latin:keyStyle="baseKeyDevanagariVowelSignAi" />
-        </case>
-        <default>
-            <!-- U+0936: "श" DEVANAGARI LETTER SHA -->
-            <Key latin:keySpec="&#x0936;" />
-            <!-- U+0939: "ह" DEVANAGARI LETTER HA -->
-            <Key latin:keySpec="&#x0939;" />
-            <!-- U+0905: "अ" DEVANAGARI LETTER A -->
-            <Key latin:keySpec="&#x0905;" />
-            <!-- U+0916: "ख" DEVANAGARI LETTER KHA -->
-            <Key latin:keySpec="&#x0916;" />
-            <!-- U+0926: "द" DEVANAGARI LETTER DA -->
-            <Key latin:keySpec="&#x0926;" />
-            <!-- U+0932: "ल" DEVANAGARI LETTER LA -->
-            <Key latin:keySpec="&#x0932;" />
-            <!-- Because the font rendering system prior to API version 16 can't automatically
-                 render dotted circle for incomplete combining letter of some scripts, different
-                 set of Key definitions are needed based on the API version. -->
-            <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_e" />
-            <Key latin:keyStyle="baseKeyDevanagariVowelSignE" />
-            <!-- Because the font rendering system prior to API version 16 can't automatically
-                 render dotted circle for incomplete combining letter of some scripts, different
-                 set of Key definitions are needed based on the API version. -->
-            <include
-                latin:keyboardLayout="@xml/keystyle_devanagari_sign_virama" />
-            <Key latin:keyStyle="baseKeyDevanagariSignVirama" />
-            <!-- U+0930: "र" DEVANAGARI LETTER RA
-                 U+0930/U+0941: "रु" DEVANAGARI LETTER RA/DEVANAGARI VOWEL SIGN U -->
-            <Key
-                latin:keySpec="&#x0930;"
-                latin:moreKeys="&#x0930;&#x0941;" />
-        </default>
-    </switch>
-</merge>
diff --git a/java/res/xml/rowkeys_nordic1.xml b/java/res/xml/rowkeys_nordic1.xml
deleted file mode 100644
index 89f4358e2..000000000
--- a/java/res/xml/rowkeys_nordic1.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <include
-        latin:keyboardLayout="@xml/rowkeys_qwerty1" />
-    <Key
-        latin:keySpec="!text/keyspec_nordic_row1_11" />
-</merge>
diff --git a/java/res/xml/rowkeys_nordic2.xml b/java/res/xml/rowkeys_nordic2.xml
deleted file mode 100644
index 5cd8152a3..000000000
--- a/java/res/xml/rowkeys_nordic2.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <include
-        latin:keyboardLayout="@xml/rowkeys_qwerty2" />
-    <Key
-        latin:keySpec="!text/keyspec_nordic_row2_10"
-        latin:moreKeys="!text/morekeys_nordic_row2_10" />
-    <Key
-        latin:keySpec="!text/keyspec_nordic_row2_11"
-        latin:moreKeys="!text/morekeys_nordic_row2_11" />
-</merge>
diff --git a/java/res/xml/rowkeys_numbers.xml b/java/res/xml/rowkeys_numbers.xml
deleted file mode 100644
index 0ae4834d9..000000000
--- a/java/res/xml/rowkeys_numbers.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
-    >
-    <switch>
-        <case
-            latin:keyboardLayoutSetElement="alphabet|alphabetAutomaticShifted|alphabetShiftLocked"
-            >
-            <include latin:keyboardLayout="@xml/rowkeys_symbols1" />
-        </case>
-        <!-- keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLockShifted" -->
-        <default>
-            <Key
-                latin:keySpec="!"
-                latin:additionalMoreKeys="!text/morekeys_exclamation" />
-            <Key
-                latin:keySpec="\@" />
-            <Key
-                latin:keySpec="\#" />
-            <Key
-                latin:keySpec="$"
-                latin:additionalMoreKeys="!text/morekeys_currency_dollar" />
-            <Key
-                latin:keySpec="%"
-                latin:additionalMoreKeys="!text/morekeys_symbols_percent" />
-            <Key
-                latin:keySpec="^" />
-            <Key
-                latin:keySpec="&amp;" />
-            <Key
-                latin:keySpec="*"
-                latin:additionalMoreKeys="!text/morekeys_star" />
-            <Key
-                latin:keySpec="(" />
-            <Key
-                latin:keySpec=")" />
-        </default>
-    </switch>
-</merge>
diff --git a/java/res/xml/rowkeys_numbers_arabic.xml b/java/res/xml/rowkeys_numbers_arabic.xml
deleted file mode 100644
index 3ac8efbc1..000000000
--- a/java/res/xml/rowkeys_numbers_arabic.xml
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <switch>
-        <case latin:keyboardLayoutSetElement="alphabet|alphabetAutomaticShifted|alphabetShiftLocked">
-            <!-- U+0661: "١" ARABIC LETTER One -->
-            <Key
-                latin:additionalMoreKeys="!,!text/morekeys_exclamation"
-                latin:keySpec="&#x0661;"
-                latin:moreKeys="1,!text/morekeys_symbols_1" />
-
-            <!-- U+0662: "٢" ARABIC LETTER Two -->
-            <Key
-                latin:additionalMoreKeys="\@"
-                latin:keySpec="&#x0662;"
-                latin:moreKeys="2,!text/morekeys_symbols_2" />
-
-            <!-- U+0663: "٣" ARABIC LETTER Three -->
-            <Key
-                latin:additionalMoreKeys="\#"
-                latin:keySpec="&#x0663;"
-                latin:moreKeys="3,!text/morekeys_symbols_3" />
-
-            <!-- U+0664: "٤" ARABIC LETTER Four -->
-            <Key
-                latin:additionalMoreKeys="$"
-                latin:keySpec="&#x0664;"
-                latin:moreKeys="4,!text/morekeys_symbols_4" />
-
-            <!-- U+0665: "٥" ARABIC LETTER Five -->
-            <Key
-                latin:additionalMoreKeys="\\%"
-                latin:keySpec="&#x0665;"
-                latin:moreKeys="5,!text/morekeys_symbols_5" />
-
-            <!-- U+0666: "٦" ARABIC LETTER Six -->
-            <Key
-                latin:additionalMoreKeys="^"
-                latin:keySpec="&#x0666;"
-                latin:moreKeys="6,!text/morekeys_symbols_6" />
-
-            <!-- U+0667: "٧" ARABIC LETTER Seven -->
-            <Key
-                latin:additionalMoreKeys="&amp;"
-                latin:keySpec="&#x0667;"
-                latin:moreKeys="7,!text/morekeys_symbols_7" />
-
-            <!-- U+0668: "٨" ARABIC LETTER Eight -->
-            <Key
-                latin:additionalMoreKeys="*"
-                latin:keySpec="&#x0668;"
-                latin:moreKeys="8,!text/morekeys_symbols_8" />
-
-            <!-- U+0669: "٩" ARABIC LETTER Nine -->
-            <Key
-                latin:additionalMoreKeys="("
-                latin:keySpec="&#x0669;"
-                latin:moreKeys="9,!text/morekeys_symbols_9" />
-
-            <!-- U+0660: "٠" ARABIC LETTER Zero -->
-            <Key
-                latin:additionalMoreKeys=")"
-                latin:keySpec="&#x0660;"
-                latin:moreKeys="0,!text/morekeys_symbols_0" />
-
-        </case>
-        <!-- keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLockShifted" -->
-        <default>
-            <Key
-                latin:additionalMoreKeys="!,!text/morekeys_exclamation"
-                latin:keySpec="1"
-                latin:moreKeys="!text/morekeys_symbols_1" />
-            <Key
-                latin:additionalMoreKeys="\@"
-                latin:keySpec="2"
-                latin:moreKeys="!text/morekeys_symbols_2" />
-            <Key
-                latin:additionalMoreKeys="\#"
-                latin:keySpec="3"
-                latin:moreKeys="!text/morekeys_symbols_3" />
-            <Key
-                latin:additionalMoreKeys="$"
-                latin:keySpec="4"
-                latin:moreKeys="!text/morekeys_symbols_4" />
-            <Key
-                latin:additionalMoreKeys="\\%"
-                latin:keySpec="5"
-                latin:moreKeys="!text/morekeys_symbols_5" />
-            <Key
-                latin:additionalMoreKeys="^"
-                latin:keySpec="6"
-                latin:moreKeys="!text/morekeys_symbols_6" />
-            <Key
-                latin:additionalMoreKeys="&amp;"
-                latin:keySpec="7"
-                latin:moreKeys="!text/morekeys_symbols_7" />
-            <Key
-                latin:additionalMoreKeys="*"
-                latin:keySpec="8"
-                latin:moreKeys="!text/morekeys_symbols_8" />
-            <Key
-                latin:additionalMoreKeys="("
-                latin:keySpec="9"
-                latin:moreKeys="!text/morekeys_symbols_9" />
-            <Key
-                latin:additionalMoreKeys=")"
-                latin:keySpec="0"
-                latin:moreKeys="!text/morekeys_symbols_0" />
-        </default>
-    </switch>
-</merge>
diff --git a/java/res/xml/rowkeys_pcqwerty1.xml b/java/res/xml/rowkeys_pcqwerty1.xml
deleted file mode 100644
index 2e4067ff8..000000000
--- a/java/res/xml/rowkeys_pcqwerty1.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <switch>
-        <case
-            latin:keyboardLayoutSetElement="alphabet|alphabetAutomaticShifted|alphabetShiftLocked"
-        >
-            <Key
-                latin:keySpec="`"
-                latin:additionalMoreKeys="~" />
-            <Key
-                latin:keySpec="1"
-                latin:additionalMoreKeys="!,!text/morekeys_exclamation"
-                latin:moreKeys="!text/morekeys_symbols_1" />
-            <Key
-                latin:keySpec="2"
-                latin:additionalMoreKeys="\@"
-                latin:moreKeys="!text/morekeys_symbols_2" />
-            <Key
-                latin:keySpec="3"
-                latin:additionalMoreKeys="\#"
-                latin:moreKeys="!text/morekeys_symbols_3" />
-            <Key
-                latin:keySpec="4"
-                latin:additionalMoreKeys="$"
-                latin:moreKeys="!text/morekeys_symbols_4" />
-            <Key
-                latin:keySpec="5"
-                latin:additionalMoreKeys="\\%"
-                latin:moreKeys="!text/morekeys_symbols_5" />
-            <Key
-                latin:keySpec="6"
-                latin:additionalMoreKeys="^"
-                latin:moreKeys="!text/morekeys_symbols_6" />
-            <Key
-                latin:keySpec="7"
-                latin:additionalMoreKeys="&amp;"
-                latin:moreKeys="!text/morekeys_symbols_7" />
-            <Key
-                latin:keySpec="8"
-                latin:additionalMoreKeys="*"
-                latin:moreKeys="!text/morekeys_symbols_8" />
-            <Key
-                latin:keySpec="9"
-                latin:additionalMoreKeys="("
-                latin:moreKeys="!text/morekeys_symbols_9" />
-            <Key
-                latin:keySpec="0"
-                latin:additionalMoreKeys=")"
-                latin:moreKeys="!text/morekeys_symbols_0" />
-            <!-- U+2013: "–" EN DASH
-                 U+2014: "—" EM DASH
-                 U+00B7: "·" MIDDLE DOT -->
-            <Key
-                latin:keySpec="-"
-                latin:additionalMoreKeys="_"
-                latin:moreKeys="&#x2013;,&#x2014;,&#x00B7;" />
-            <!-- U+221E: "∞" INFINITY
-                 U+2260: "≠" NOT EQUAL TO
-                 U+2248: "≈" ALMOST EQUAL TO -->
-            <Key
-                latin:keySpec="="
-                latin:additionalMoreKeys="+"
-                latin:moreKeys="!fixedColumnOrder!4,&#x221E;,&#x2260;,&#x2248;,%" />
-        </case>
-        <!-- keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLockShifted" -->
-        <default>
-            <include
-                 latin:keyboardLayout="@xml/rowkeys_pcqwerty1_shift" />
-        </default>
-    </switch>
-</merge>
diff --git a/java/res/xml/rowkeys_pcqwerty1_shift.xml b/java/res/xml/rowkeys_pcqwerty1_shift.xml
deleted file mode 100644
index c925a86bd..000000000
--- a/java/res/xml/rowkeys_pcqwerty1_shift.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <Key
-        latin:keySpec="~" />
-    <Key
-        latin:keySpec="!"
-        latin:additionalMoreKeys="!text/morekeys_exclamation" />
-    <Key
-        latin:keySpec="\@" />
-    <Key
-        latin:keySpec="\#" />
-    <Key
-        latin:keySpec="$"
-        latin:additionalMoreKeys="!text/morekeys_currency_dollar" />
-    <Key
-        latin:keySpec="%"
-        latin:additionalMoreKeys="!text/morekeys_symbols_percent" />
-    <Key
-        latin:keySpec="^" />
-    <Key
-        latin:keySpec="&amp;" />
-    <Key
-        latin:keySpec="*"
-        latin:additionalMoreKeys="!text/morekeys_star" />
-    <Key
-        latin:keySpec="(" />
-    <Key
-        latin:keySpec=")" />
-    <Key
-        latin:keySpec="_" />
-    <!-- U+00D7: "×" MULTIPLICATION SIGN
-         U+00F7: "÷" DIVISION SIGN
-         U+221A: "√" SQUARE ROOT -->
-    <Key
-        latin:keySpec="+"
-        latin:additionalMoreKeys="!text/morekeys_plus"
-        latin:moreKeys="&#x00D7;,&#x00F7;,&#x221A;" />
-</merge>
diff --git a/java/res/xml/rowkeys_pcqwerty2.xml b/java/res/xml/rowkeys_pcqwerty2.xml
deleted file mode 100644
index 781aec8bf..000000000
--- a/java/res/xml/rowkeys_pcqwerty2.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <!-- The keys on this PC layout row2 consist of the letters of QWERTY layout row1 and
-         some symbols keys. -->
-    <include
-        latin:keyboardLayout="@xml/rowkeys_qwerty1"
-        latin:keyLabelFlags="disableAdditionalMoreKeys|disableKeyHintLabel" />
-    <include
-        latin:keyboardLayout="@xml/keys_pcqwerty2_right3" />
-</merge>
diff --git a/java/res/xml/rowkeys_pcqwerty3.xml b/java/res/xml/rowkeys_pcqwerty3.xml
deleted file mode 100644
index f888fe2b6..000000000
--- a/java/res/xml/rowkeys_pcqwerty3.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <!-- The keys on this PC layout row3 consist of the letters of QWERTY layout row2 and
-         some symbols keys. -->
-    <include
-        latin:keyboardLayout="@xml/rowkeys_qwerty2" />
-    <include
-        latin:keyboardLayout="@xml/keys_pcqwerty3_right2" />
-</merge>
diff --git a/java/res/xml/rowkeys_pcqwerty4.xml b/java/res/xml/rowkeys_pcqwerty4.xml
deleted file mode 100644
index 7e46828a1..000000000
--- a/java/res/xml/rowkeys_pcqwerty4.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <!-- The keys on this PC layout row4 consist of the letters of QWERTY layout row3 and
-         some symbols keys. -->
-    <include
-        latin:keyboardLayout="@xml/rowkeys_qwerty3" />
-    <include
-        latin:keyboardLayout="@xml/keys_pcqwerty4_right3" />
-</merge>
diff --git a/java/res/xml/rowkeys_qwerty1.xml b/java/res/xml/rowkeys_qwerty1.xml
deleted file mode 100644
index 35c34fad1..000000000
--- a/java/res/xml/rowkeys_qwerty1.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <!-- q,w,e,r,t -->
-    <include
-        latin:keyboardLayout="@xml/rowkeys_qwerty1_left5" />
-    <!-- y,u,i,o,p -->
-    <include
-        latin:keyboardLayout="@xml/rowkeys_qwerty1_right5" />
-</merge>
diff --git a/java/res/xml/rowkeys_qwerty1_left5.xml b/java/res/xml/rowkeys_qwerty1_left5.xml
deleted file mode 100644
index a4f089d29..000000000
--- a/java/res/xml/rowkeys_qwerty1_left5.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2014, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <Key
-        latin:keySpec="!text/keyspec_q"
-        latin:moreKeys="!text/morekeys_q,!text/qwertysyms_q,!text/number_1" />
-    <Key
-        latin:keySpec="!text/keyspec_w"
-        latin:moreKeys="!text/morekeys_w,!text/qwertysyms_w,!text/number_2" />
-    <Key
-        latin:keySpec="e"
-        latin:moreKeys="!text/morekeys_e,!text/qwertysyms_e,!text/number_3" />
-    <Key
-        latin:keySpec="r"
-        latin:moreKeys="!text/morekeys_r,!text/qwertysyms_r,!text/number_4" />
-    <Key
-        latin:keySpec="t"
-        latin:moreKeys="!text/morekeys_t,!text/qwertysyms_t,!text/number_5" />
-</merge>
diff --git a/java/res/xml/rowkeys_qwerty1_right5.xml b/java/res/xml/rowkeys_qwerty1_right5.xml
deleted file mode 100644
index c999a8f48..000000000
--- a/java/res/xml/rowkeys_qwerty1_right5.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2014, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <Key
-        latin:keySpec="!text/keyspec_y"
-        latin:moreKeys="!text/morekeys_y,!text/qwertysyms_y,!text/number_6" />
-    <Key
-        latin:keySpec="u"
-        latin:moreKeys="!text/morekeys_u,!text/qwertysyms_u,!text/number_7" />
-    <Key
-        latin:keySpec="i"
-        latin:moreKeys="!text/morekeys_i,!text/qwertysyms_i,!text/number_8" />
-    <Key
-        latin:keySpec="o"
-        latin:moreKeys="!text/morekeys_o,!text/qwertysyms_o,!text/number_9" />
-    <Key
-        latin:keySpec="p"
-        latin:moreKeys="!text/morekeys_p,!text/qwertysyms_p,!text/number_0" />
-</merge>
diff --git a/java/res/xml/rowkeys_qwerty2.xml b/java/res/xml/rowkeys_qwerty2.xml
deleted file mode 100644
index 794bb82a4..000000000
--- a/java/res/xml/rowkeys_qwerty2.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <!-- a,s,d,f,g -->
-    <include
-        latin:keyboardLayout="@xml/rowkeys_qwerty2_left5" />
-    <!-- h,j,k,l -->
-    <include
-        latin:keyboardLayout="@xml/rowkeys_qwerty2_right4" />
-</merge>
diff --git a/java/res/xml/rowkeys_qwerty2_left5.xml b/java/res/xml/rowkeys_qwerty2_left5.xml
deleted file mode 100644
index 083851dae..000000000
--- a/java/res/xml/rowkeys_qwerty2_left5.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2014, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <Key
-        latin:keySpec="a"
-        latin:moreKeys="!text/morekeys_a,!text/qwertysyms_a" />
-    <Key
-        latin:keySpec="s"
-        latin:moreKeys="!text/morekeys_s,!text/qwertysyms_s" />
-    <Key
-        latin:keySpec="d"
-        latin:moreKeys="!text/morekeys_d,!text/qwertysyms_d" />
-    <Key
-        latin:keySpec="f"
-        latin:moreKeys="!text/morekeys_f,!text/qwertysyms_f" />
-    <Key
-        latin:keySpec="g"
-        latin:moreKeys="!text/morekeys_g,!text/qwertysyms_g" />
-</merge>
diff --git a/java/res/xml/rowkeys_qwerty2_right4.xml b/java/res/xml/rowkeys_qwerty2_right4.xml
deleted file mode 100644
index 16b1fc90d..000000000
--- a/java/res/xml/rowkeys_qwerty2_right4.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2014, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <Key
-        latin:keySpec="h"
-        latin:moreKeys="!text/morekeys_h,!text/qwertysyms_h" />
-    <Key
-        latin:keySpec="j"
-        latin:moreKeys="!text/morekeys_j,!text/qwertysyms_j" />
-    <Key
-        latin:keySpec="k"
-        latin:moreKeys="!text/morekeys_k,!text/qwertysyms_k" />
-    <Key
-        latin:keySpec="l"
-        latin:moreKeys="!text/morekeys_l,!text/qwertysyms_l" />
-</merge>
diff --git a/java/res/xml/rowkeys_qwerty3.xml b/java/res/xml/rowkeys_qwerty3.xml
deleted file mode 100644
index 97f46b741..000000000
--- a/java/res/xml/rowkeys_qwerty3.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <!-- z,x,c,v -->
-    <include
-        latin:keyboardLayout="@xml/rowkeys_qwerty3_left4" />
-    <!-- b,n,m -->
-    <include
-        latin:keyboardLayout="@xml/rowkeys_qwerty3_right3" />
-</merge>
diff --git a/java/res/xml/rowkeys_qwerty3_left4.xml b/java/res/xml/rowkeys_qwerty3_left4.xml
deleted file mode 100644
index b18502f2f..000000000
--- a/java/res/xml/rowkeys_qwerty3_left4.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2014, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <Key
-        latin:keySpec="z"
-        latin:moreKeys="!text/morekeys_z,!text/qwertysyms_z" />
-    <Key
-        latin:keySpec="!text/keyspec_x"
-        latin:moreKeys="!text/morekeys_x,!text/qwertysyms_x" />
-    <Key
-        latin:keySpec="c"
-        latin:moreKeys="!text/morekeys_c,!text/qwertysyms_c" />
-    <Key
-        latin:keySpec="v"
-        latin:moreKeys="!text/morekeys_v,!text/qwertysyms_v" />
-</merge>
diff --git a/java/res/xml/rowkeys_qwerty3_right3.xml b/java/res/xml/rowkeys_qwerty3_right3.xml
deleted file mode 100644
index 87e4593b5..000000000
--- a/java/res/xml/rowkeys_qwerty3_right3.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2014, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <Key
-        latin:keySpec="b"
-        latin:moreKeys="!text/morekeys_b,!text/qwertysyms_b" />
-    <Key
-        latin:keySpec="n"
-        latin:moreKeys="!text/morekeys_n,!text/qwertysyms_n" />
-    <Key
-        latin:keySpec="m"
-        latin:moreKeys="!text/morekeys_m,!text/qwertysyms_m" />
-</merge>
diff --git a/java/res/xml/rowkeys_qwertz1.xml b/java/res/xml/rowkeys_qwertz1.xml
deleted file mode 100644
index e6bbb1187..000000000
--- a/java/res/xml/rowkeys_qwertz1.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <!-- q, w, e, r, t -->
-    <include
-        latin:keyboardLayout="@xml/rowkeys_qwerty1_left5" />
-
-    <!-- z, u, i, o, p -->
-    <Key
-        latin:keySpec="z"
-        latin:moreKeys="!text/morekeys_z,!text/qwertysyms_y,!text/number_6" />
-    <Key
-        latin:keySpec="u"
-        latin:moreKeys="!text/morekeys_u,!text/qwertysyms_u,!text/number_7" />
-    <Key
-        latin:keySpec="i"
-        latin:moreKeys="!text/morekeys_i,!text/qwertysyms_i,!text/number_8" />
-    <Key
-        latin:keySpec="o"
-        latin:moreKeys="!text/morekeys_o,!text/qwertysyms_o,!text/number_9" />
-    <Key
-        latin:keySpec="p"
-        latin:moreKeys="!text/morekeys_p,!text/qwertysyms_p,!text/number_0" />
-</merge>
diff --git a/java/res/xml/rowkeys_qwertz3.xml b/java/res/xml/rowkeys_qwertz3.xml
deleted file mode 100644
index 4fdd62a54..000000000
--- a/java/res/xml/rowkeys_qwertz3.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <Key
-        latin:keySpec="!text/keyspec_y"
-        latin:moreKeys="!text/morekeys_y,!text/qwertysyms_z" />
-    <Key
-        latin:keySpec="!text/keyspec_x"
-        latin:moreKeys="!text/morekeys_x,!text/qwertysyms_x" />
-    <Key
-        latin:keySpec="c"
-        latin:moreKeys="!text/morekeys_c,!text/qwertysyms_c" />
-    <Key
-        latin:keySpec="v"
-        latin:moreKeys="!text/morekeys_v,!text/qwertysyms_v" />
-
-    <!-- b, n, m -->
-    <include
-        latin:keyboardLayout="@xml/rowkeys_qwerty3_right3" />
-</merge>
diff --git a/java/res/xml/rowkeys_serbian_qwertz1.xml b/java/res/xml/rowkeys_serbian_qwertz1.xml
deleted file mode 100644
index 4cc58cac8..000000000
--- a/java/res/xml/rowkeys_serbian_qwertz1.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2014, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto" >
-    <include latin:keyboardLayout="@xml/rowkeys_qwertz1" />
-    <!-- U+0161: "š" LATIN SMALL LETTER S WITH CARON -->
-    <Key latin:keySpec="&#x0161;" />
-</merge>
\ No newline at end of file
diff --git a/java/res/xml/rowkeys_serbian_qwertz2.xml b/java/res/xml/rowkeys_serbian_qwertz2.xml
deleted file mode 100644
index b008f805b..000000000
--- a/java/res/xml/rowkeys_serbian_qwertz2.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2014, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto" >
-    <include latin:keyboardLayout="@xml/rowkeys_qwerty2" />
-    <!-- U+010D: "č" LATIN SMALL LETTER C WITH CARON -->
-    <Key latin:keySpec="&#x010D;" />
-    <!-- U+0107: "ć" LATIN SMALL LETTER C WITH ACUTE -->
-    <Key latin:keySpec="&#x0107;" />
-</merge>
diff --git a/java/res/xml/rowkeys_serbian_qwertz3.xml b/java/res/xml/rowkeys_serbian_qwertz3.xml
deleted file mode 100644
index 8bf69d901..000000000
--- a/java/res/xml/rowkeys_serbian_qwertz3.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2014, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto" >
-    <include latin:keyboardLayout="@xml/rowkeys_qwertz3" />
-    <!-- U+0111: "đ" LATIN SMALL LETTER D WITH STROKE -->
-    <Key latin:keySpec="&#x0111;" />
-    <!-- U+017E: "ž" LATIN SMALL LETTER Z WITH CARON -->
-    <Key latin:keySpec="&#x017E;" />
-</merge>
diff --git a/java/res/xml/rowkeys_sinhala1.xml b/java/res/xml/rowkeys_sinhala1.xml
deleted file mode 100644
index 8affb37aa..000000000
--- a/java/res/xml/rowkeys_sinhala1.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2014, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <switch>
-        <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
-            <!-- U+0DD6: "ූ" SINHALA VOWEL SIGN DIGA PAA-PILLA -->
-            <Key latin:keySpec="&#x0DD6;" />
-            <!-- U+0D8B: "උ" SINHALA LETTER UYANNA -->
-            <Key latin:keySpec="&#x0D8B;" />
-            <!-- U+0DD1: "ෑ" SINHALA VOWEL SIGN DIGA AEDA-PILLA -->
-            <Key latin:keySpec="&#x0DD1;" />
-            <!-- U+0D8D: "ඍ" SINHALA LETTER IRUYANNA -->
-            <Key latin:keySpec="&#x0D8D;" />
-            <!-- U+0D94: "ඔ" SINHALA LETTER OYANNA -->
-            <Key latin:keySpec="&#x0D94;" />
-            <!-- U+0DC1: "ශ" SINHALA LETTER TAALUJA SAYANNA -->
-            <Key latin:keySpec="&#x0DC1;" />
-            <!-- U+0DB9: "ඹ" SINHALA LETTER AMBA BAYANNA -->
-            <Key latin:keySpec="&#x0DB9;" />
-            <!-- U+0DC2: "ෂ" SINHALA LETTER MUURDHAJA SAYANNA -->
-            <Key latin:keySpec="&#x0DC2;" />
-            <!-- U+0DB0: "ධ" SINHALA LETTER MAHAAPRAANA DAYANNA -->
-            <Key latin:keySpec="&#x0DB0;" />
-            <!-- U+0DA1: "ඡ" SINHALA LETTER MAHAAPRAANA CAYANNA -->
-            <Key latin:keySpec="&#x0DA1;" />
-            <!-- U+0DA5: "ඥ" SINHALA LETTER TAALUJA SANYOOGA NAAKSIKYAYA
-                 U+0DF4: "෴" SINHALA PUNCTUATION KUNDDALIYA  -->
-            <Key
-                latin:keySpec="&#x0DA5;"
-                latin:moreKeys="&#x0DF4;" />
-        </case>
-        <default>
-            <!-- U+0DD4: "ු" SINHALA VOWEL SIGN KETTI PAA-PILLA -->
-            <Key
-                latin:keySpec="&#x0DD4;"
-                latin:keyHintLabel="1"
-                latin:additionalMoreKeys="1" />
-            <!-- U+0D85: "අ" SINHALA LETTER AYANNA -->
-            <Key
-                latin:keySpec="&#x0D85;"
-                latin:keyHintLabel="2"
-                latin:additionalMoreKeys="2" />
-            <!-- U+0DD0: "ැ" SINHALA VOWEL SIGN KETTI AEDA-PILLA -->
-            <Key
-                latin:keySpec="&#x0DD0;"
-                latin:keyHintLabel="3"
-                latin:additionalMoreKeys="3" />
-            <!-- U+0DBB: "ර" SINHALA LETTER RAYANNA -->
-            <Key
-                latin:keySpec="&#x0DBB;"
-                latin:keyHintLabel="4"
-                latin:additionalMoreKeys="4" />
-            <!-- U+0D91: "එ" SINHALA LETTER EYANNA -->
-            <Key
-                latin:keySpec="&#x0D91;"
-                latin:keyHintLabel="5"
-                latin:additionalMoreKeys="5" />
-            <!-- U+0DC4: "හ" SINHALA LETTER HAYANNA -->
-            <Key
-                latin:keySpec="&#x0DC4;"
-                latin:keyHintLabel="6"
-                latin:additionalMoreKeys="6" />
-            <!-- U+0DB8: "ම" SINHALA LETTER MAYANNA -->
-            <Key
-                latin:keySpec="&#x0DB8;"
-                latin:keyHintLabel="7"
-                latin:additionalMoreKeys="7" />
-            <!-- U+0DC3: "ස" SINHALA LETTER DANTAJA SAYANNA -->
-            <Key
-                latin:keySpec="&#x0DC3;"
-                latin:keyHintLabel="8"
-                latin:additionalMoreKeys="8" />
-            <!-- U+0DAF: "ද" SINHALA LETTER ALPAPRAANA DAYANNA
-                 U+0DB3: "ඳ" SINHALA LETTER SANYAKA DAYANNA -->
-            <Key
-                latin:keySpec="&#x0DAF;"
-                latin:moreKeys="&#x0DB3;"
-                latin:keyHintLabel="9"
-                latin:additionalMoreKeys="9" />
-            <!-- U+0DA0: "ච" SINHALA LETTER ALPAPRAANA CAYANNA -->
-            <Key
-                latin:keySpec="&#x0DA0;"
-                latin:keyHintLabel="0"
-                latin:additionalMoreKeys="0" />
-            <!-- U+0DA4: "ඤ" SINHALA LETTER TAALUJA NAASIKYAYA
-                 U+0DF4: "෴" SINHALA PUNCTUATION KUNDDALIYA -->
-            <Key
-                latin:keySpec="&#x0DA4;"
-                latin:moreKeys="&#x0DF4;" />
-        </default>
-    </switch>
-</merge>
diff --git a/java/res/xml/rowkeys_sinhala2.xml b/java/res/xml/rowkeys_sinhala2.xml
deleted file mode 100644
index 1e1fffc1e..000000000
--- a/java/res/xml/rowkeys_sinhala2.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2014, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <switch>
-        <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
-            <!-- U+0DDF: "ෟ" SINHALA VOWEL SIGN GAYANUKITTA -->
-            <Key latin:keySpec="&#x0DDF;" />
-            <!-- U+0DD3: "ී" SINHALA VOWEL SIGN DIGA IS-PILLA -->
-            <Key latin:keySpec="&#x0DD3;" />
-            <!-- U+0DD8: "ෘ" SINHALA VOWEL SIGN GAETTA-PILLA -->
-            <Key latin:keySpec="&#x0DD8;" />
-            <!-- U+0DC6: "ෆ" SINHALA LETTER FAYANNA -->
-            <Key latin:keySpec="&#x0DC6;" />
-            <!-- U+0DA8: "ඨ" SINHALA LETTER MAHAAPRAANA TTAYANNA -->
-            <Key latin:keySpec="&#x0DA8;" />
-            <!-- U+0DCA/U+200D/U+0DBA: "්‍ය" SINHALA SIGN AL-LAKUNA/ZERO WIDTH JOINER/SINHALA LETTER YAYANNA -->
-            <Key latin:keySpec="&#x0DCA;&#x200D;&#x0DBA;" />
-            <!-- U+0DC5/U+0DD4: "ළු" SINHALA LETTER MUURDHAJA LAYANNA/SINHALA VOWEL SIGN KETTI PAA-PILLA -->
-            <Key latin:keySpec="&#x0DC5;&#x0DD4;" />
-            <!-- U+0DAB: "ණ" SINHALA LETTER MUURDHAJA NAYANNA -->
-            <Key latin:keySpec="&#x0DAB;" />
-            <!-- U+0D9B: "ඛ" SINHALA LETTER MAHAAPRAANA KAYANNA -->
-            <Key latin:keySpec="&#x0D9B;" />
-            <!-- U+0DAE: "ථ" SINHALA LETTER MAHAAPRAANA TAYANNA -->
-            <Key latin:keySpec="&#x0DAE;" />
-            <!-- U+0DCA/U+200D/U+0DBB: "්‍ර" SINHALA SIGN AL-LAKUNA/ZERO WIDTH JOINER/SINHALA LETTER RAYANNA -->
-            <Key latin:keySpec="&#x0DCA;&#x200D;&#x0DBB;" />
-        </case>
-        <default>
-            <!-- U+0DCA: "්" SINHALA SIGN AL-LAKUNA -->
-            <Key latin:keySpec="&#x0DCA;" />
-            <!-- U+0DD2: "ි" SINHALA VOWEL SIGN KETTI IS-PILLA -->
-            <Key latin:keySpec="&#x0DD2;" />
-            <!-- U+0DCF: "ා" SINHALA VOWEL SIGN AELA-PILLA -->
-            <Key latin:keySpec="&#x0DCF;" />
-            <!-- U+0DD9: "ෙ" SINHALA VOWEL SIGN KOMBUVA -->
-            <Key latin:keySpec="&#x0DD9;" />
-            <!-- U+0DA7: "ට" SINHALA LETTER ALPAPRAANA TTAYANNA -->
-            <Key latin:keySpec="&#x0DA7;" />
-            <!-- U+0DBA: "ය" SINHALA LETTER YAYANNA -->
-            <Key latin:keySpec="&#x0DBA;" />
-            <!-- U+0DC0: "ව" SINHALA LETTER VAYANNA -->
-            <Key latin:keySpec="&#x0DC0;" />
-            <!-- U+0DB1: "න" SINHALA LETTER DANTAJA NAYANNA -->
-            <Key latin:keySpec="&#x0DB1;" />
-            <!-- U+0D9A: "ක" SINHALA LETTER ALPAPRAANA KAYANNA -->
-            <Key latin:keySpec="&#x0D9A;" />
-            <!-- U+0DAD: "ත" SINHALA LETTER ALPAPRAANA TAYANNA -->
-            <Key latin:keySpec="&#x0DAD;" />
-            <!-- U+0D8F: "ඏ" SINHALA LETTER ILUYANNA -->
-            <Key latin:keySpec="&#x0D8F;" />
-        </default>
-    </switch>
-</merge>
diff --git a/java/res/xml/rowkeys_sinhala3.xml b/java/res/xml/rowkeys_sinhala3.xml
deleted file mode 100644
index fae9f5ef9..000000000
--- a/java/res/xml/rowkeys_sinhala3.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2014, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <switch>
-        <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
-            <!-- U+0D9E: "ඞ" SINHALA LETTER KANTAJA NAASIKYAYA -->
-            <Key latin:keySpec="&#x0D9E;" />
-            <!-- U+0DA3: "ඣ" SINHALA LETTER MAHAAPRAANA JAYANNA -->
-            <Key latin:keySpec="&#x0DA3;" />
-            <!-- U+0DAA: "ඪ" SINHALA LETTER MAHAAPRAANA DDAYANNA -->
-            <Key latin:keySpec="&#x0DAA;" />
-            <!-- U+0D8A: "ඊ" SINHALA LETTER IIYANNA -->
-            <Key latin:keySpec="&#x0D8A;" />
-            <!-- U+0DB7: "භ" SINHALA LETTER MAHAAPRAANA BAYANNA -->
-            <Key latin:keySpec="&#x0DB7;" />
-            <!-- U+0DB5: "ඵ" SINHALA LETTER MAHAAPRAANA PAYANNA -->
-            <Key latin:keySpec="&#x0DB5;" />
-            <!-- U+0DC5: "ළ" SINHALA LETTER MUURDHAJA LAYANNA -->
-            <Key latin:keySpec="&#x0DC5;" />
-            <!-- U+0D9D: "ඝ" SINHALA LETTER MAHAAPRAANA GAYANNA -->
-            <Key latin:keySpec="&#x0D9D;" />
-            <!-- U+0DBB/U+0DCA/U+200D: "ර්‍" SINHALA LETTER RAYANNA/SINHALA SIGN AL-LAKUNA/ZERO WIDTH JOINER -->
-            <Key latin:keySpec="&#x0DBB;&#x0DCA;&#x200D;" />
-        </case>
-        <default>
-            <!-- U+0D82: "ං" SINHALA SIGN ANUSVARAYA
-                 U+0D83: "ඃ" SINHALA SIGN VISARGAYA -->
-            <Key
-                latin:keySpec="&#x0D82;"
-                latin:moreKeys="&#x0D83;" />
-            <!-- U+0DA2: "ජ" SINHALA LETTER ALPAPRAANA JAYANNA
-                 U+0DA6: "ඦ" SINHALA LETTER SANYAKA JAYANNA -->
-            <Key
-                latin:keySpec="&#x0DA2;"
-                latin:moreKeys="&#x0DA6;" />
-            <!-- U+0DA9: "ඩ" SINHALA LETTER ALPAPRAANA DDAYANNA
-                 U+0DAC: "ඬ" SINHALA LETTER SANYAKA DDAYANNA -->
-            <Key
-                latin:keySpec="&#x0DA9;"
-                latin:moreKeys="&#x0DAC;" />
-            <!-- U+0D89: "ඉ" SINHALA LETTER IYANNA -->
-            <Key latin:keySpec="&#x0D89;" />
-            <!-- U+0DB6: "බ" SINHALA LETTER ALPAPRAANA BAYANNA -->
-            <Key latin:keySpec="&#x0DB6;" />
-            <!-- U+0DB4: "ප" SINHALA LETTER ALPAPRAANA PAYANNA -->
-            <Key latin:keySpec="&#x0DB4;" />
-            <!-- U+0DBD: "ල" SINHALA LETTER DANTAJA LAYANNA -->
-            <Key latin:keySpec="&#x0DBD;" />
-            <!-- U+0D9C: "ග" SINHALA LETTER ALPAPRAANA GAYANNA
-                 U+0D9F: "ඟ" SINHALA LETTER SANYAKA GAYANNA -->
-            <Key
-                latin:keySpec="&#x0D9C;"
-                latin:moreKeys="&#x0D9F;" />
-            <!-- U+0DF3: "ෳ" SINHALA VOWEL SIGN DIGA GAYANUKITTA -->
-            <Key latin:keySpec="&#x0DF3;" />
-        </default>
-    </switch>
-</merge>
diff --git a/java/res/xml/rowkeys_south_slavic1.xml b/java/res/xml/rowkeys_south_slavic1.xml
deleted file mode 100644
index a289bfa0f..000000000
--- a/java/res/xml/rowkeys_south_slavic1.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <!-- U+0459: "љ" CYRILLIC SMALL LETTER LJE -->
-    <Key
-        latin:keySpec="&#x0459;"
-        latin:keyHintLabel="1"
-        latin:additionalMoreKeys="1" />
-    <!-- U+045A: "њ" CYRILLIC SMALL LETTER NJE -->
-    <Key
-        latin:keySpec="&#x045A;"
-        latin:keyHintLabel="2"
-        latin:additionalMoreKeys="2" />
-    <!-- U+0435: "е" CYRILLIC SMALL LETTER IE -->
-    <Key
-        latin:keySpec="&#x0435;"
-        latin:keyHintLabel="3"
-        latin:additionalMoreKeys="3"
-        latin:moreKeys="!text/morekeys_cyrillic_ie" />
-    <!-- U+0440: "р" CYRILLIC SMALL LETTER ER -->
-    <Key
-        latin:keySpec="&#x0440;"
-        latin:keyHintLabel="4"
-        latin:additionalMoreKeys="4" />
-    <!-- U+0442: "т" CYRILLIC SMALL LETTER TE -->
-    <Key
-        latin:keySpec="&#x0442;"
-        latin:keyHintLabel="5"
-        latin:additionalMoreKeys="5" />
-    <Key
-        latin:keySpec="!text/keyspec_south_slavic_row1_6"
-        latin:keyHintLabel="6"
-        latin:additionalMoreKeys="6" />
-    <!-- U+0443: "у" CYRILLIC SMALL LETTER U -->
-    <Key
-        latin:keySpec="&#x0443;"
-        latin:keyHintLabel="7"
-        latin:additionalMoreKeys="7" />
-    <!-- U+0438: "и" CYRILLIC SMALL LETTER I -->
-    <Key
-        latin:keySpec="&#x0438;"
-        latin:keyHintLabel="8"
-        latin:additionalMoreKeys="8"
-        latin:moreKeys="!text/morekeys_cyrillic_i" />
-    <!-- U+043E: "о" CYRILLIC SMALL LETTER O -->
-    <Key
-        latin:keySpec="&#x043E;"
-        latin:keyHintLabel="9"
-        latin:additionalMoreKeys="9" />
-    <!-- U+043F: "п" CYRILLIC SMALL LETTER PE -->
-    <Key
-        latin:keySpec="&#x043F;"
-        latin:keyHintLabel="0"
-        latin:additionalMoreKeys="0" />
-    <!-- U+0448: "ш" CYRILLIC SMALL LETTER SHA -->
-    <Key
-        latin:keySpec="&#x0448;" />
-</merge>
diff --git a/java/res/xml/rowkeys_south_slavic2.xml b/java/res/xml/rowkeys_south_slavic2.xml
deleted file mode 100644
index 4a5e67dc1..000000000
--- a/java/res/xml/rowkeys_south_slavic2.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <!-- U+0430: "а" CYRILLIC SMALL LETTER A -->
-    <Key
-        latin:keySpec="&#x0430;" />
-    <!-- U+0441: "с" CYRILLIC SMALL LETTER ES -->
-    <Key
-        latin:keySpec="&#x0441;" />
-    <!-- U+0434: "д" CYRILLIC SMALL LETTER DE -->
-    <Key
-        latin:keySpec="&#x0434;" />
-    <!-- U+0444: "ф" CYRILLIC SMALL LETTER EF -->
-    <Key
-        latin:keySpec="&#x0444;" />
-    <!-- U+0433: "г" CYRILLIC SMALL LETTER GHE -->
-    <Key
-        latin:keySpec="&#x0433;" />
-    <!-- U+0445: "х" CYRILLIC SMALL LETTER HA -->
-    <Key
-        latin:keySpec="&#x0445;" />
-    <!-- U+0458: "ј" CYRILLIC SMALL LETTER JE -->
-    <Key
-        latin:keySpec="&#x0458;" />
-    <!-- U+043A: "к" CYRILLIC SMALL LETTER KA -->
-    <Key
-        latin:keySpec="&#x043A;" />
-    <!-- U+043B: "л" CYRILLIC SMALL LETTER EL -->
-    <Key
-        latin:keySpec="&#x043B;" />
-    <!-- U+0447: "ч" CYRILLIC SMALL LETTER CHE -->
-    <Key
-        latin:keySpec="&#x0447;" />
-    <Key
-        latin:keySpec="!text/keyspec_south_slavic_row2_11" />
-</merge>
diff --git a/java/res/xml/rowkeys_south_slavic3.xml b/java/res/xml/rowkeys_south_slavic3.xml
deleted file mode 100644
index de580b2a3..000000000
--- a/java/res/xml/rowkeys_south_slavic3.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <Key
-        latin:keySpec="!text/keyspec_south_slavic_row3_1" />
-    <!-- U+045F: "џ" CYRILLIC SMALL LETTER DZHE -->
-    <Key
-        latin:keySpec="&#x045F;" />
-    <!-- U+0446: "ц" CYRILLIC SMALL LETTER TSE -->
-    <Key
-        latin:keySpec="&#x0446;" />
-    <!-- U+0432: "в" CYRILLIC SMALL LETTER VE -->
-    <Key
-        latin:keySpec="&#x0432;" />
-    <!-- U+0431: "б" CYRILLIC SMALL LETTER BE -->
-    <Key
-        latin:keySpec="&#x0431;" />
-    <!-- U+043D: "н" CYRILLIC SMALL LETTER EN -->
-    <Key
-        latin:keySpec="&#x043D;" />
-    <!-- U+043C: "м" CYRILLIC SMALL LETTER EM -->
-    <Key
-        latin:keySpec="&#x043C;" />
-    <Key
-        latin:keySpec="!text/keyspec_south_slavic_row3_8" />
-    <!-- U+0436: "ж" CYRILLIC SMALL LETTER ZHE -->
-    <Key
-        latin:keySpec="&#x0436;" />
-</merge>
diff --git a/java/res/xml/rowkeys_spanish2.xml b/java/res/xml/rowkeys_spanish2.xml
deleted file mode 100644
index 8866d3279..000000000
--- a/java/res/xml/rowkeys_spanish2.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <include
-        latin:keyboardLayout="@xml/rowkeys_qwerty2" />
-    <!-- U+00F1: "ñ" LATIN SMALL LETTER N WITH TILDE -->
-    <Key
-        latin:keySpec="!text/keyspec_spanish_row2_10" />
- </merge>
diff --git a/java/res/xml/rowkeys_swiss1.xml b/java/res/xml/rowkeys_swiss1.xml
deleted file mode 100644
index 9c8e3bb72..000000000
--- a/java/res/xml/rowkeys_swiss1.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2013, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <include
-        latin:keyboardLayout="@xml/rowkeys_qwertz1" />
-    <Key
-        latin:keySpec="!text/keyspec_swiss_row1_11"
-        latin:moreKeys="!text/morekeys_swiss_row1_11" />
-</merge>
diff --git a/java/res/xml/rowkeys_swiss2.xml b/java/res/xml/rowkeys_swiss2.xml
deleted file mode 100644
index b4f2c8eb1..000000000
--- a/java/res/xml/rowkeys_swiss2.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2013, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <include
-        latin:keyboardLayout="@xml/rowkeys_qwerty2" />
-    <Key
-        latin:keySpec="!text/keyspec_swiss_row2_10"
-        latin:moreKeys="!text/morekeys_swiss_row2_10" />
-    <Key
-        latin:keySpec="!text/keyspec_swiss_row2_11"
-        latin:moreKeys="!text/morekeys_swiss_row2_11" />
-</merge>
diff --git a/java/res/xml/rowkeys_symbols1.xml b/java/res/xml/rowkeys_symbols1.xml
deleted file mode 100644
index cb1e33798..000000000
--- a/java/res/xml/rowkeys_symbols1.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <Key
-        latin:keySpec="!text/keyspec_symbols_1"
-        latin:additionalMoreKeys="!text/additional_morekeys_symbols_1"
-        latin:moreKeys="!text/morekeys_symbols_1"
-        latin:doNotSuppressNumbersInMoreKeys="true" />
-    <Key
-        latin:keySpec="!text/keyspec_symbols_2"
-        latin:additionalMoreKeys="!text/additional_morekeys_symbols_2"
-        latin:moreKeys="!text/morekeys_symbols_2"
-        latin:doNotSuppressNumbersInMoreKeys="true" />
-    <Key
-        latin:keySpec="!text/keyspec_symbols_3"
-        latin:additionalMoreKeys="!text/additional_morekeys_symbols_3"
-        latin:moreKeys="!text/morekeys_symbols_3"
-        latin:doNotSuppressNumbersInMoreKeys="true" />
-    <Key
-        latin:keySpec="!text/keyspec_symbols_4"
-        latin:additionalMoreKeys="!text/additional_morekeys_symbols_4"
-        latin:moreKeys="!text/morekeys_symbols_4"
-        latin:doNotSuppressNumbersInMoreKeys="true" />
-    <Key
-        latin:keySpec="!text/keyspec_symbols_5"
-        latin:additionalMoreKeys="!text/additional_morekeys_symbols_5"
-        latin:moreKeys="!text/morekeys_symbols_5"
-        latin:doNotSuppressNumbersInMoreKeys="true" />
-    <Key
-        latin:keySpec="!text/keyspec_symbols_6"
-        latin:additionalMoreKeys="!text/additional_morekeys_symbols_6"
-        latin:moreKeys="!text/morekeys_symbols_6"
-        latin:doNotSuppressNumbersInMoreKeys="true" />
-    <Key
-        latin:keySpec="!text/keyspec_symbols_7"
-        latin:additionalMoreKeys="!text/additional_morekeys_symbols_7"
-        latin:moreKeys="!text/morekeys_symbols_7"
-        latin:doNotSuppressNumbersInMoreKeys="true" />
-    <Key
-        latin:keySpec="!text/keyspec_symbols_8"
-        latin:additionalMoreKeys="!text/additional_morekeys_symbols_8"
-        latin:moreKeys="!text/morekeys_symbols_8"
-        latin:doNotSuppressNumbersInMoreKeys="true" />
-    <Key
-        latin:keySpec="!text/keyspec_symbols_9"
-        latin:additionalMoreKeys="!text/additional_morekeys_symbols_9"
-        latin:moreKeys="!text/morekeys_symbols_9"
-        latin:doNotSuppressNumbersInMoreKeys="true" />
-    <Key
-        latin:keySpec="!text/keyspec_symbols_0"
-        latin:additionalMoreKeys="!text/additional_morekeys_symbols_0"
-        latin:moreKeys="!text/morekeys_symbols_0"
-        latin:doNotSuppressNumbersInMoreKeys="true" />
-</merge>
diff --git a/java/res/xml/rowkeys_symbols2.xml b/java/res/xml/rowkeys_symbols2.xml
deleted file mode 100644
index 40d4817b6..000000000
--- a/java/res/xml/rowkeys_symbols2.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <switch>
-        <case
-            latin:languageCode="fa"
-        >
-            <!-- U+066C: "٬" ARABIC THOUSANDS SEPARATOR
-                 U+066B: "٫" ARABIC DECIMAL SEPARATOR -->
-            <Key
-                latin:keySpec="&#x066C;"
-                latin:keyHintLabel="\@"
-                latin:moreKeys="\@" />
-            <Key
-                latin:keySpec="&#x066B;"
-                latin:keyHintLabel="\#"
-                latin:moreKeys="\#" />
-        </case>
-        <default>
-            <Key
-                latin:keySpec="\@" />
-            <Key
-                latin:keySpec="\#" />
-        </default>
-    </switch>
-    <Key
-        latin:keyStyle="currencyKeyStyle"
-        latin:keyLabelFlags="followKeyLetterRatio" />
-    <Key
-        latin:keySpec="!text/keyspec_symbols_percent"
-        latin:moreKeys="!text/morekeys_symbols_percent" />
-    <Key
-        latin:keySpec="&amp;" />
-    <!-- U+2013: "–" EN DASH
-         U+2014: "—" EM DASH
-         U+00B7: "·" MIDDLE DOT -->
-    <Key
-        latin:keySpec="-"
-        latin:moreKeys="_,&#x2013;,&#x2014;,&#x00B7;" />
-    <Key
-        latin:keySpec="+"
-        latin:moreKeys="!text/morekeys_plus" />
-    <include
-        latin:keyboardLayout="@xml/keys_parentheses" />
-</merge>
diff --git a/java/res/xml/rowkeys_symbols3.xml b/java/res/xml/rowkeys_symbols3.xml
deleted file mode 100644
index 7b52b1f63..000000000
--- a/java/res/xml/rowkeys_symbols3.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <Key
-        latin:keySpec="*"
-        latin:moreKeys="!text/morekeys_star" />
-    <switch>
-        <case
-            latin:languageCode="fa"
-        >
-            <Key
-                latin:keySpec="!text/keyspec_left_double_angle_quote"
-                latin:moreKeys="!text/morekeys_double_quote" />
-            <Key
-                latin:keySpec="!text/keyspec_right_double_angle_quote"
-                latin:moreKeys="!text/morekeys_single_quote" />
-        </case>
-        <default>
-            <Key
-                latin:keySpec="&quot;"
-                latin:moreKeys="!text/morekeys_double_quote" />
-            <Key
-                latin:keySpec="\'"
-                latin:moreKeys="!text/morekeys_single_quote" />
-        </default>
-    </switch>
-    <Key
-        latin:keySpec=":" />
-    <Key
-        latin:keySpec="!text/keyspec_symbols_semicolon"
-        latin:moreKeys="!text/morekeys_symbols_semicolon" />
-    <Key
-        latin:keySpec="!"
-        latin:moreKeys="!text/morekeys_exclamation" />
-    <Key
-        latin:keySpec="!text/keyspec_symbols_question"
-        latin:moreKeys="!text/morekeys_question" />
-</merge>
diff --git a/java/res/xml/rowkeys_symbols_shift1.xml b/java/res/xml/rowkeys_symbols_shift1.xml
deleted file mode 100644
index 93992091a..000000000
--- a/java/res/xml/rowkeys_symbols_shift1.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <Key
-        latin:keySpec="~" />
-    <Key
-        latin:keySpec="`" />
-    <Key
-        latin:keySpec="|" />
-    <!-- U+2022: "•" BULLET -->
-    <Key
-        latin:keySpec="&#x2022;"
-        latin:moreKeys="!text/morekeys_bullet" />
-    <!-- U+221A: "√" SQUARE ROOT -->
-    <Key
-        latin:keySpec="&#x221A;" />
-    <!-- U+03C0: "π" GREEK SMALL LETTER PI
-         U+03A0: "Π" GREEK CAPITAL LETTER PI -->
-    <Key
-        latin:keySpec="&#x03C0;"
-        latin:moreKeys="&#x03A0;" />
-    <!-- U+00F7: "÷" DIVISION SIGN -->
-    <Key
-        latin:keySpec="&#x00F7;" />
-    <!-- U+00D7: "×" MULTIPLICATION SIGN -->
-    <Key
-        latin:keySpec="&#x00D7;" />
-    <!-- U+00B6: "¶" PILCROW SIGN
-         U+00A7: "§" SECTION SIGN -->
-    <Key
-        latin:keySpec="&#x00B6;"
-        latin:moreKeys="&#x00A7;" />
-    <!-- U+2206: "∆" INCREMENT -->
-    <Key
-        latin:keySpec="&#x2206;" />
-</merge>
diff --git a/java/res/xml/rowkeys_symbols_shift2.xml b/java/res/xml/rowkeys_symbols_shift2.xml
deleted file mode 100644
index 990a95043..000000000
--- a/java/res/xml/rowkeys_symbols_shift2.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <Key
-        latin:keyStyle="moreCurrency1KeyStyle" />
-    <Key
-        latin:keyStyle="moreCurrency2KeyStyle" />
-    <Key
-        latin:keyStyle="moreCurrency3KeyStyle" />
-    <Key
-        latin:keyStyle="moreCurrency4KeyStyle" />
-    <!-- U+2191: "↑" UPWARDS ARROW
-         U+2193: "↓" DOWNWARDS ARROW
-         U+2190: "←" LEFTWARDS ARROW
-         U+2192: "→" RIGHTWARDS ARROW -->
-    <Key
-        latin:keySpec="^"
-        latin:moreKeys="&#x2191;,&#x2193;,&#x2190;,&#x2192;" />
-    <!-- U+00B0: "°" DEGREE SIGN
-         U+2032: "′" PRIME
-         U+2033: "″" DOUBLE PRIME -->
-    <Key
-        latin:keySpec="&#x00B0;"
-        latin:moreKeys="&#x2032;,&#x2033;" />
-    <!-- U+2260: "≠" NOT EQUAL TO
-         U+2248: "≈" ALMOST EQUAL TO
-         U+221E: "∞" INFINITY -->
-    <Key
-        latin:keySpec="="
-        latin:moreKeys="&#x2260;,&#x2248;,&#x221E;" />
-    <include
-        latin:keyboardLayout="@xml/keys_curly_brackets" />
-</merge>
diff --git a/java/res/xml/rowkeys_symbols_shift3.xml b/java/res/xml/rowkeys_symbols_shift3.xml
deleted file mode 100644
index 4d1818e42..000000000
--- a/java/res/xml/rowkeys_symbols_shift3.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <Key
-        latin:keySpec="\\" />
-    <!-- U+00A9: "©" COPYRIGHT SIGN -->
-    <Key
-        latin:keySpec="&#x00A9;" />
-    <!-- U+00AE: "®" REGISTERED SIGN -->
-    <Key
-        latin:keySpec="&#x00AE;" />
-    <!-- U+2122: "™" TRADE MARK SIGN -->
-    <Key
-        latin:keySpec="&#x2122;" />
-    <!-- U+2105: "℅" CARE OF -->
-    <Key
-        latin:keySpec="&#x2105;" />
-    <include
-        latin:keyboardLayout="@xml/keys_square_brackets" />
-</merge>
diff --git a/java/res/xml/rowkeys_tamil1.xml b/java/res/xml/rowkeys_tamil1.xml
deleted file mode 100644
index 8f723bdbc..000000000
--- a/java/res/xml/rowkeys_tamil1.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2014, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <!-- U+0B94: "ஔ" TAMIL LETTER AU
-         U+0BCC: "ௌ" TAMIL VOWEL SIGN AU -->
-    <Key
-        latin:keySpec="&#x0B94;"
-        latin:moreKeys="&#x0BCC;,%"
-        latin:keyHintLabel="1"
-        latin:additionalMoreKeys="1" />
-    <!-- U+0B90: "ஐ" TAMIL LETTER AI
-         U+0BC8: "ை" TAMIL VOWEL SIGN AI -->
-    <Key
-        latin:keySpec="&#x0B90;"
-        latin:moreKeys="&#x0BC8;,%"
-        latin:keyHintLabel="2"
-        latin:additionalMoreKeys="2" />
-    <!-- U+0B86: "ஆ" TAMIL LETTER AA
-         U+0BBE: "ா" TAMIL VOWEL SIGN AA -->
-    <Key
-        latin:keySpec="&#x0B86;"
-        latin:moreKeys="&#x0BBE;,%"
-        latin:keyHintLabel="3"
-        latin:additionalMoreKeys="3" />
-    <!-- U+0B88: "ஈ" TAMIL LETTER II
-         U+0BC0: "ீ" TAMIL VOWEL SIGN II -->
-    <Key
-        latin:keySpec="&#x0B88;"
-        latin:moreKeys="&#x0BC0;,%"
-        latin:keyHintLabel="4"
-        latin:additionalMoreKeys="4" />
-    <!-- U+0B8A: "ஊ" TAMIL LETTER UU
-         U+0BC2: "ூ" TAMIL VOWEL SIGN UU -->
-    <Key
-        latin:keySpec="&#x0B8A;"
-        latin:moreKeys="&#x0BC2;,%"
-        latin:keyHintLabel="5"
-        latin:additionalMoreKeys="5" />
-    <!-- U+0BAE: "ம" TAMIL LETTER MA -->
-    <Key
-        latin:keySpec="&#x0BAE;"
-        latin:keyHintLabel="6"
-        latin:additionalMoreKeys="6" />
-    <!-- U+0BA9: "ன" TAMIL LETTER NNNA -->
-    <Key
-        latin:keySpec="&#x0BA9;"
-        latin:keyHintLabel="7"
-        latin:additionalMoreKeys="7" />
-    <!-- U+0BA8: "ந" TAMIL LETTER NA -->
-    <Key
-        latin:keySpec="&#x0BA8;"
-        latin:keyHintLabel="8"
-        latin:additionalMoreKeys="8" />
-    <!-- U+0B99: "ங" TAMIL LETTER NGA -->
-    <Key
-        latin:keySpec="&#x0B99;"
-        latin:keyHintLabel="9"
-        latin:additionalMoreKeys="9" />
-    <!-- U+0BA3: "ண" TAMIL LETTER NNA -->
-    <Key
-        latin:keySpec="&#x0BA3;"
-        latin:keyHintLabel="0"
-        latin:additionalMoreKeys="0" />
-    <!-- U+0B9E: "ஞ" TAMIL LETTER NYA -->
-    <Key latin:keySpec="&#x0B9E;" />
-</merge>
diff --git a/java/res/xml/rowkeys_tamil2.xml b/java/res/xml/rowkeys_tamil2.xml
deleted file mode 100644
index ccf98b365..000000000
--- a/java/res/xml/rowkeys_tamil2.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2014, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <!-- U+0B93: "ஓ" TAMIL LETTER OO
-         U+0BCB: "ோ" TAMIL VOWEL SIGN OO
-         U+0BD0: "ௐ" TAMIL OM -->
-    <Key
-        latin:keySpec="&#x0B93;"
-        latin:moreKeys="&#x0BCB;,&#x0BD0;" />
-    <!-- U+0B8F: "ஏ" TAMIL LETTER EE
-         U+0BC7: "ே" TAMIL VOWEL SIGN EE -->
-    <Key
-        latin:keySpec="&#x0B8F;"
-        latin:moreKeys="&#x0BC7;" />
-    <!-- U+0B85: "அ" TAMIL LETTER A
-         U+0B83: "ஃ" TAMIL SIGN VISARGA -->
-    <Key
-        latin:keySpec="&#x0B85;"
-        latin:moreKeys="&#x0B83;" />
-    <!-- U+0B87: "இ" TAMIL LETTER I
-         U+0BBF: "ி" TAMIL VOWEL SIGN I -->
-    <Key
-        latin:keySpec="&#x0B87;"
-        latin:moreKeys="&#x0BBF;" />
-    <!-- U+0B89: "உ" TAMIL LETTER U
-         U+0BC1: "ு" TAMIL VOWEL SIGN U -->
-    <Key
-        latin:keySpec="&#x0B89;"
-        latin:moreKeys="&#x0BC1;" />
-    <!-- U+0BB1: "ற" TAMIL LETTER RRA -->
-    <Key latin:keySpec="&#x0BB1;" />
-    <!-- U+0BAA: "ப" TAMIL LETTER PA -->
-    <Key latin:keySpec="&#x0BAA;" />
-    <!-- U+0B95: "க" TAMIL LETTER KA
-         U+0BB9: "ஹ" TAMIL LETTER HA
-         U+0B95/U+0BCD/U+0BB7: "க்ஷ" TAMIL LETTER KA/TAMIL SIGN VIRAMA/TAMIL LETTER SSA -->
-    <Key
-        latin:keySpec="&#x0B95;"
-        latin:moreKeys="&#x0BB9;,&#x0B95;&#x0BCD;&#x0BB7;" />
-    <!-- U+0BA4: "த" TAMIL LETTER TA -->
-    <Key latin:keySpec="&#x0BA4;" />
-    <!-- U+0B9A: "ச" TAMIL LETTER CA
-         U+0BB8: "ஸ" TAMIL LETTER SA
-         U+0BB6/U+0BCD/U+0BB0/U+0BC0: "ஶ்ரீ" TAMIL LETTER SHA/TAMIL SIGN VIRAMA/TAMIL LETTER RA/TAMIL VOWEL SIGN II -->
-    <Key
-        latin:keySpec="&#x0B9A;"
-        latin:moreKeys="&#x0BB8;,&#x0BB6;&#x0BCD;&#x0BB0;&#x0BC0;" />
-    <!-- U+0B9F: "ட" TAMIL LETTER TTA -->
-    <Key latin:keySpec="&#x0B9F;" />
-</merge>
diff --git a/java/res/xml/rowkeys_tamil3.xml b/java/res/xml/rowkeys_tamil3.xml
deleted file mode 100644
index 281314ddf..000000000
--- a/java/res/xml/rowkeys_tamil3.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2014, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <!-- U+0B92: "ஒ" TAMIL LETTER O
-         U+0BCA: "ொ" TAMIL VOWEL SIGN O -->
-    <Key
-        latin:keySpec="&#x0B92;"
-        latin:moreKeys="&#x0BCA;" />
-    <!-- U+0B8E: "எ" TAMIL LETTER E
-         U+0BC6: "ெ" TAMIL VOWEL SIGN E -->
-    <Key
-        latin:keySpec="&#x0B8E;"
-        latin:moreKeys="&#x0BC6;" />
-    <!-- U+0BCD: "்" TAMIL SIGN VIRAMA -->
-    <Key latin:keySpec="&#x0BCD;" />
-    <!-- U+0BB0: "ர" TAMIL LETTER RA -->
-    <Key latin:keySpec="&#x0BB0;" />
-    <!-- U+0BB5: "வ" TAMIL LETTER VA -->
-    <Key latin:keySpec="&#x0BB5;" />
-    <!-- U+0BB4: "ழ TAMIL LETTER LLLA -->
-    <Key latin:keySpec="&#x0BB4;" />
-    <!-- U+0BB2: "ல" TAMIL LETTER LA -->
-    <Key latin:keySpec="&#x0BB2;" />
-    <!-- U+0BB3: "ள" TAMIL LETTER LLA -->
-    <Key latin:keySpec="&#x0BB3;" />
-    <!-- U+0BAF: "ய" TAMIL LETTER YA -->
-    <Key latin:keySpec="&#x0BAF;" />
-    <!-- U+0BB7: "ஷ" TAMIL LETTER SSA
-         U+0B9C: "ஜ" TAMIL LETTER JA -->
-    <Key
-        latin:keySpec="&#x0BB7;"
-        latin:moreKeys="&#x0B9C;" />
-</merge>
diff --git a/java/res/xml/rowkeys_telugu1.xml b/java/res/xml/rowkeys_telugu1.xml
deleted file mode 100644
index 20bc695bd..000000000
--- a/java/res/xml/rowkeys_telugu1.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2014, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <!-- U+0C4C: "ౌ" TELUGU VOWEL SIGN AU
-         U+0C14: "ఔ" TELUGU LETTER AU -->
-    <Key
-        latin:keySpec="&#x0C4C;"
-        latin:moreKeys="&#x0C14;,%"
-        latin:keyHintLabel="1"
-        latin:additionalMoreKeys="1" />
-    <!-- U+0C48: "ై" TELUGU VOWEL SIGN AI
-         U+0C10: "ఐ" TELUGU LETTER AI -->
-    <Key
-        latin:keySpec="&#x0C48;"
-        latin:moreKeys="&#x0C10;,%"
-        latin:keyHintLabel="2"
-        latin:additionalMoreKeys="2" />
-    <!-- U+0C3E: "ా" TELUGU VOWEL SIGN AA
-         U+0C06: "ఆ" TELUGU LETTER AA -->
-    <Key
-        latin:keySpec="&#x0C3E;"
-        latin:moreKeys="&#x0C06;,%"
-        latin:keyHintLabel="3"
-        latin:additionalMoreKeys="3" />
-    <!-- U+0C40: "ీ" TELUGU VOWEL SIGN II
-         U+0C08: "ఈ" TELUGU LETTER II -->
-    <Key
-        latin:keySpec="&#x0C40;"
-        latin:moreKeys="&#x0C08;,%"
-        latin:keyHintLabel="4"
-        latin:additionalMoreKeys="4" />
-    <!-- U+0C42: "ూ" TELUGU VOWEL SIGN UU
-         U+0C0A: "ఊ" TELUGU LETTER UU -->
-    <Key
-        latin:keySpec="&#x0C42;"
-        latin:moreKeys="&#x0C0A;,%"
-        latin:keyHintLabel="5"
-        latin:additionalMoreKeys="5" />
-    <!-- U+0C2C: "బ" TELUGU LETTER BA
-         U+0C2D: "భ" TELUGU LETTER BHA -->
-    <Key
-        latin:keySpec="&#x0C2C;"
-        latin:moreKeys="&#x0C2D;,%"
-        latin:keyHintLabel="6"
-        latin:additionalMoreKeys="6" />
-    <!-- U+0C39: "హ" TELUGU LETTER HA
-         U+0C03: "ః" TELUGU SIGN VISARGA -->
-    <Key
-        latin:keySpec="&#x0C39;"
-        latin:moreKeys="&#x0C03;,%"
-        latin:keyHintLabel="7"
-        latin:additionalMoreKeys="7" />
-    <!-- U+0C17: "గ" TELUGU LETTER GA
-         U+0C18: "ఘ" TELUGU LETTER GHA -->
-    <Key
-        latin:keySpec="&#x0C17;"
-        latin:moreKeys="&#x0C18;,%"
-        latin:keyHintLabel="8"
-        latin:additionalMoreKeys="8" />
-    <!-- U+0C26: "ద" TELUGU LETTER DA
-         U+0C27: "ధ" TELUGU LETTER DHA -->
-    <Key
-        latin:keySpec="&#x0C26;"
-        latin:moreKeys="&#x0C27;,%"
-        latin:keyHintLabel="9"
-        latin:additionalMoreKeys="9" />
-    <!-- U+0C1C: "జ" TELUGU LETTER JA
-         U+0C1D: "ఝ" TELUGU LETTER JHA -->
-    <Key
-        latin:keySpec="&#x0C1C;"
-        latin:moreKeys="&#x0C1D;,%"
-        latin:keyHintLabel="0"
-        latin:additionalMoreKeys="0" />
-    <!-- U+0C21: "డ" TELUGU LETTER DDA
-         U+0C22: "ఢ" TELUGU LETTER DDHA -->
-    <Key
-        latin:keySpec="&#x0C21;"
-        latin:moreKeys="&#x0C22;" />
-</merge>
diff --git a/java/res/xml/rowkeys_telugu2.xml b/java/res/xml/rowkeys_telugu2.xml
deleted file mode 100644
index c3c4a6b81..000000000
--- a/java/res/xml/rowkeys_telugu2.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2014, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <!-- U+0C4B: "ో" TELUGU VOWEL SIGN OO
-         U+0C13: "ఓ" TELUGU LETTER OO -->
-    <Key
-        latin:keySpec="&#x0C4B;"
-        latin:moreKeys="&#x0C13;" />
-    <!-- U+0C47: "ే" TELUGU VOWEL SIGN EE
-         U+0C0F: "ఏ" TELUGU LETTER EE -->
-    <Key
-        latin:keySpec="&#x0C47;"
-        latin:moreKeys="&#x0C0F;" />
-    <!-- U+0C4D: "్" TELUGU SIGN VIRAMA
-         U+0C05: "అ" TELUGU LETTER A -->
-    <Key
-        latin:keySpec="&#x0C4D;"
-        latin:moreKeys="&#x0C05;" />
-    <!-- U+0C3F: "ి" TELUGU VOWEL SIGN I
-         U+0C07: "ఇ" TELUGU LETTER I -->
-    <Key
-        latin:keySpec="&#x0C3F;"
-        latin:moreKeys="&#x0C07;" />
-    <!-- U+0C41: "ు" TELUGU VOWEL SIGN U
-         U+0C09: "ఉ" TELUGU LETTER U -->
-    <Key
-        latin:keySpec="&#x0C41;"
-        latin:moreKeys="&#x0C09;" />
-    <!-- U+0C2A: "ప" TELUGU LETTER PA
-         U+0C2B: "ఫ" TELUGU LETTER PHA -->
-    <Key
-        latin:keySpec="&#x0C2A;"
-        latin:moreKeys="&#x0C2B;" />
-    <!-- U+0C30: "ర" TELUGU LETTER RA
-         U+0C31: "ఱ" TELUGU LETTER RRA
-         U+0C4D/U+0C30: "్ర" TELUGU SIGN VIRAMA/TELUGU LETTER RA -->
-    <Key
-        latin:keySpec="&#x0C30;"
-        latin:moreKeys="&#x0C31;,&#x0C4D;&#x0C30;" />
-    <!-- U+0C15: "క" TELUGU LETTER KA
-         U+0C16: "ఖ" TELUGU LETTER KHA -->
-    <Key
-        latin:keySpec="&#x0C15;"
-        latin:moreKeys="&#x0C16;" />
-    <!-- U+0C24: "త" TELUGU LETTER TA
-         U+0C25: "థ" TELUGU LETTER THA -->
-    <Key
-        latin:keySpec="&#x0C24;"
-        latin:moreKeys="&#x0C25;" />
-    <!-- U+0C1A: "చ" TELUGU LETTER CA
-         U+0C1B: "ఛ" TELUGU LETTER CHA -->
-    <Key
-        latin:keySpec="&#x0C1A;"
-        latin:moreKeys="&#x0C1B;" />
-    <!-- U+0C1F: "ట" TELUGU LETTER TTA
-         U+0C20: "ఠ" TELUGU LETTER TTHA -->
-    <Key
-        latin:keySpec="&#x0C1F;"
-        latin:moreKeys="&#x0C20;" />
-</merge>
diff --git a/java/res/xml/rowkeys_telugu3.xml b/java/res/xml/rowkeys_telugu3.xml
deleted file mode 100644
index e42eaa503..000000000
--- a/java/res/xml/rowkeys_telugu3.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2014, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <!-- U+0C4A: "ొ" TELUGU VOWEL SIGN O
-         U+0C12: "ఒ" TELUGU LETTER O -->
-    <Key
-        latin:keySpec="&#x0C4A;"
-        latin:moreKeys="&#x0C12;" />
-    <!-- U+0C46: "ె" TELUGU VOWEL SIGN E
-         U+0C0E: "ఎ" TELUGU LETTER E -->
-    <Key
-        latin:keySpec="&#x0C46;"
-        latin:moreKeys="&#x0C0E;" />
-    <!-- U+0C2E: "మ" TELUGU LETTER MA
-         U+0C02: "ం" TELUGU SIGN ANUSVARA
-         U+0C01: "ఁ" TELUGU SIGN CANDRABINDU -->
-    <Key latin:keySpec="&#x0C2E;"
-         latin:moreKeys="&#x0C02;,&#x0C01;" />
-    <!-- U+0C28: "న" TELUGU LETTER NA
-         U+0C23: "ణ" TELUGU LETTER NNA
-         U+0C19: "ఙ" TELUGU LETTER NGA
-         U+0C1E: "ఞ" TELUGU LETTER NYA -->
-    <Key
-        latin:keySpec="&#x0C28;"
-        latin:moreKeys="&#x0C23;,&#x0C19;,&#x0C1E;" />
-    <!-- U+0C35: "వ" TELUGU LETTER VA -->
-    <Key latin:keySpec="&#x0C35;" />
-    <!-- U+0C32: "ల" TELUGU LETTER LA
-         U+0C33: "ళ" TELUGU LETTER LLA -->
-    <Key
-        latin:keySpec="&#x0C32;"
-        latin:moreKeys="&#x0C33;" />
-    <!-- U+0C38: "స" TELUGU LETTER SA
-         U+0C36: "శ" TELUGU LETTER SHA -->
-    <Key
-        latin:keySpec="&#x0C38;"
-        latin:moreKeys="&#x0C36;" />
-    <!-- U+0C0B: "ఋ" TELUGU LETTER VOCALIC R
-         U+0C43: "ృ" TELUGU VOWEL SIGN VOCALIC R -->
-    <Key
-        latin:keySpec="&#x0C0B;"
-        latin:moreKeys="&#x0C43;" />
-    <!-- U+0C37: "ష" TELUGU LETTER SSA
-         U+0C15/U+0C4D/U+0C37: "క్ష" TELUGU LETTER KA/TELUGU SIGN VIRAMA/TELUGU LETTER SSA -->
-    <Key
-        latin:keySpec="&#x0C37;"
-        latin:moreKeys="&#x0C15;&#x0C4D;&#x0C37;" />
-    <!-- U+0C2F: "య" TELUGU LETTER YA
-         U+0C1C/U+0C4D/U+0C1E: "జ్ఞ" TELUGU LETTER JA/TELUGU SIGN VIRAMA/TELUGU LETTER NYA -->
-    <Key
-        latin:keySpec="&#x0C2F;"
-        latin:moreKeys="&#x0C1C;&#x0C4D;&#x0C1E;" />
-</merge>
diff --git a/java/res/xml/rowkeys_thai1.xml b/java/res/xml/rowkeys_thai1.xml
deleted file mode 100644
index 2211994b5..000000000
--- a/java/res/xml/rowkeys_thai1.xml
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <switch>
-        <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
-            <Key
-                latin:keySpec="+"
-                latin:keyLabelFlags="fontDefault" />
-            <!-- U+0E51: "๑" THAI DIGIT ONE -->
-            <Key latin:keySpec="&#x0E51;" />
-            <!-- U+0E52: "๒" THAI DIGIT TWO -->
-            <Key latin:keySpec="&#x0E52;" />
-            <!-- U+0E53: "๓" THAI DIGIT THREE -->
-            <Key latin:keySpec="&#x0E53;" />
-            <!-- U+0E54: "๔" THAI DIGIT FOUR -->
-            <Key latin:keySpec="&#x0E54;" />
-            <!-- U+0020: " " SPACE
-                 U+0E39: " ู" THAI CHARACTER SARA UU -->
-            <!-- Note: The space character is needed as a preceding letter to draw some Thai
-                 composing characters correctly. -->
-            <Key
-                latin:keySpec="&#x20;&#x0E39;|&#x0E39;"
-                latin:keyLabelFlags="followKeyLetterRatio" />
-            <!-- U+0E3F: "฿" THAI CURRENCY SYMBOL BAHT -->
-            <Key latin:keySpec="&#x0E3F;" />
-            <!-- U+0E55: "๕" THAI DIGIT FIVE -->
-            <Key latin:keySpec="&#x0E55;" />
-            <!-- U+0E56: "๖" THAI DIGIT SIX -->
-            <Key latin:keySpec="&#x0E56;" />
-            <!-- U+0E57: "๗" THAI DIGIT SEVEN -->
-            <Key latin:keySpec="&#x0E57;" />
-            <!-- U+0E58: "๘" THAI DIGIT EIGHT -->
-            <Key latin:keySpec="&#x0E58;" />
-            <!-- U+0E59: "๙" THAI DIGIT NINE -->
-            <Key latin:keySpec="&#x0E59;" />
-        </case>
-        <default>
-            <!-- U+0E45: "ๅ" THAI CHARACTER LAKKHANGYAO -->
-            <Key latin:keySpec="&#x0E45;" />
-            <!-- U+0E51: "๑" THAI DIGIT ONE -->
-            <Key
-                latin:keySpec="/"
-                latin:keyHintLabel="1"
-                latin:additionalMoreKeys="1"
-                latin:moreKeys="&#x0E51;"
-                latin:keyLabelFlags="fontDefault" />
-            <!-- U+0E52: "๒" THAI DIGIT TWO -->
-            <Key
-                latin:keySpec="_"
-                latin:keyHintLabel="2"
-                latin:additionalMoreKeys="2"
-                latin:moreKeys="&#x0E52;"
-                latin:keyLabelFlags="fontDefault" />
-            <!-- U+0E20: "ภ" THAI CHARACTER PHO SAMPHAO
-                 U+0E53: "๓" THAI DIGIT THREE -->
-            <Key
-                latin:keySpec="&#x0E20;"
-                latin:keyHintLabel="3"
-                latin:additionalMoreKeys="3"
-                latin:moreKeys="&#x0E53;" />
-            <!-- U+0E16: "ถ" THAI CHARACTER THO THUNG
-                 U+0E54: "๔" THAI DIGIT FOUR -->
-            <Key
-                latin:keySpec="&#x0E16;"
-                latin:keyHintLabel="4"
-                latin:additionalMoreKeys="4"
-                latin:moreKeys="&#x0E54;" />
-            <!-- U+0020: " " SPACE
-                 U+0E38: " ุ" THAI CHARACTER SARA U -->
-            <!-- Note: The space character is needed as a preceding letter to draw some Thai
-                 composing characters correctly. -->
-            <Key
-                latin:keySpec="&#x20;&#x0E38;|&#x0E38;"
-                latin:keyLabelFlags="followKeyLetterRatio" />
-            <!-- U+0020: " " SPACE
-                 U+0E36: " ึ" THAI CHARACTER SARA UE -->
-            <!-- Note: The space character is needed as a preceding letter to draw some Thai
-                 composing characters correctly. -->
-            <Key
-                latin:keySpec="&#x20;&#x0E36;|&#x0E36;"
-                latin:keyLabelFlags="followKeyLetterRatio" />
-            <!-- U+0E04: "ค" THAI CHARACTER KHO KHWAI
-                 U+0E55: "๕" THAI DIGIT FIVE -->
-            <Key
-                latin:keySpec="&#x0E04;"
-                latin:keyHintLabel="5"
-                latin:additionalMoreKeys="5"
-                latin:moreKeys="&#x0E55;" />
-            <!-- U+0E15: "ต" THAI CHARACTER TO TAO
-                 U+0E56: "๖" THAI DIGIT SIX -->
-            <Key
-                latin:keySpec="&#x0E15;"
-                latin:keyHintLabel="6"
-                latin:additionalMoreKeys="6"
-                latin:moreKeys="&#x0E56;" />
-            <!-- U+0E08: "จ" THAI CHARACTER CHO CHAN
-                 U+0E57: "๗" THAI DIGIT SEVEN -->
-            <Key
-                latin:keySpec="&#x0E08;"
-                latin:keyHintLabel="7"
-                latin:additionalMoreKeys="7"
-                latin:moreKeys="&#x0E57;" />
-            <!-- U+0E02: "ข" THAI CHARACTER KHO KHAI
-                 U+0E58: "๘" THAI DIGIT EIGHT -->
-            <Key
-                latin:keySpec="&#x0E02;"
-                latin:keyHintLabel="8"
-                latin:additionalMoreKeys="8"
-                latin:moreKeys="&#x0E58;" />
-            <!-- U+0E0A: "ช" THAI CHARACTER CHO CHANG
-                 U+0E59: "๙" THAI DIGIT NINE -->
-            <Key
-                latin:keySpec="&#x0E0A;"
-                latin:keyHintLabel="9"
-                latin:additionalMoreKeys="9"
-                latin:moreKeys="&#x0E59;" />
-        </default>
-    </switch>
-</merge>
diff --git a/java/res/xml/rowkeys_thai2.xml b/java/res/xml/rowkeys_thai2.xml
deleted file mode 100644
index 4aee1cd17..000000000
--- a/java/res/xml/rowkeys_thai2.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <switch>
-        <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
-            <!-- U+0E50: "๐" THAI DIGIT ZERO -->
-            <Key latin:keySpec="&#x0E50;" />
-            <Key
-                latin:keySpec="&quot;"
-                latin:keyLabelFlags="fontDefault" />
-            <!-- U+0E0E: "ฎ" THAI CHARACTER DO CHADA -->
-            <Key latin:keySpec="&#x0E0E;" />
-            <!-- U+0E11: "ฑ" THAI CHARACTER THO NANGMONTHO -->
-            <Key latin:keySpec="&#x0E11;" />
-            <!-- U+0E18: "ธ" THAI CHARACTER THO THONG -->
-            <Key latin:keySpec="&#x0E18;" />
-            <!-- U+0020: " " SPACE
-                 U+0E4D: " ํ" THAI CHARACTER THANTHAKHAT -->
-            <!-- Note: The space character is needed as a preceding letter to draw some Thai
-                 composing characters correctly. -->
-            <Key
-                latin:keySpec="&#x20;&#x0E4D;|&#x0E4D;"
-                latin:keyLabelFlags="followKeyLetterRatio" />
-            <!-- U+0020: " " SPACE
-                 U+0E4A: " ๊" THAI CHARACTER MAI TRI -->
-            <!-- Note: The space character is needed as a preceding letter to draw some Thai
-                 composing characters correctly. -->
-            <Key
-                latin:keySpec="&#x20;&#x0E4A;|&#x0E4A;"
-                latin:keyLabelFlags="followKeyLetterRatio" />
-            <!-- U+0E13: "ณ" THAI CHARACTER NO NEN -->
-            <Key latin:keySpec="&#x0E13;" />
-            <!-- U+0E2F: "ฯ" THAI CHARACTER PAIYANNOI -->
-            <Key latin:keySpec="&#x0E2F;" />
-            <!-- U+0E0D: "ญ" THAI CHARACTER YO YING -->
-            <Key latin:keySpec="&#x0E0D;" />
-            <!-- U+0E10: "ฐ" THAI CHARACTER THO THAN -->
-            <Key latin:keySpec="&#x0E10;" />
-            <Key
-                latin:keySpec=","
-                latin:keyLabelFlags="fontDefault" />
-        </case>
-        <default>
-            <!-- U+0E46: "ๆ" THAI CHARACTER MAIYAMOK
-                 U+0E50: "๐" THAI DIGIT ZERO -->
-            <Key
-                latin:keySpec="&#x0E46;"
-                latin:keyHintLabel="0"
-                latin:additionalMoreKeys="0"
-                latin:moreKeys="&#x0E50;" />
-            <!-- U+0E44: "ไ" THAI CHARACTER SARA AI MAIMALAI -->
-            <Key latin:keySpec="&#x0E44;" />
-            <!-- U+0E33: "ำ" THAI CHARACTER SARA AM -->
-            <Key latin:keySpec="&#x0E33;" />
-            <!-- U+0E1E: "พ" THAI CHARACTER PHO PHAN -->
-            <Key latin:keySpec="&#x0E1E;" />
-            <!-- U+0E30: "ะ" THAI CHARACTER SARA A -->
-            <Key latin:keySpec="&#x0E30;" />
-            <!-- U+0020: " " SPACE
-                 U+0E31: " ั" THAI CHARACTER MAI HAN-AKAT -->
-            <!-- Note: The space character is needed as a preceding letter to draw some Thai
-                 composing characters correctly. -->
-            <Key
-                latin:keySpec="&#x20;&#x0E31;|&#x0E31;"
-                latin:keyLabelFlags="followKeyLetterRatio" />
-            <!-- U+0020: " " SPACE
-                 U+0E35: " ี" HAI CHARACTER SARA II -->
-            <!-- Note: The space character is needed as a preceding letter to draw some Thai
-                 composing characters correctly. -->
-            <Key
-                latin:keySpec="&#x20;&#x0E35;|&#x0E35;"
-                latin:keyLabelFlags="followKeyLetterRatio" />
-            <!-- U+0E23: "ร" THAI CHARACTER RO RUA -->
-            <Key latin:keySpec="&#x0E23;" />
-            <!-- U+0E19: "น" THAI CHARACTER NO NU -->
-            <Key latin:keySpec="&#x0E19;" />
-            <!-- U+0E22: "ย" THAI CHARACTER YO YAK -->
-            <Key latin:keySpec="&#x0E22;" />
-            <!-- U+0E1A: "บ" THAI CHARACTER BO BAIMAI -->
-            <Key latin:keySpec="&#x0E1A;" />
-            <!-- U+0E25: "ล" THAI CHARACTER LO LING -->
-            <Key latin:keySpec="&#x0E25;" />
-        </default>
-    </switch>
-</merge>
diff --git a/java/res/xml/rowkeys_thai3.xml b/java/res/xml/rowkeys_thai3.xml
deleted file mode 100644
index fd2191339..000000000
--- a/java/res/xml/rowkeys_thai3.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <switch>
-        <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
-            <!-- U+0E24: "ฤ" THAI CHARACTER RU -->
-            <Key latin:keySpec="&#x0E24;" />
-            <!-- U+0E06: "ฆ" THAI CHARACTER KHO RAKHANG -->
-            <Key latin:keySpec="&#x0E06;" />
-            <!-- U+0E0F: "ฏ" THAI CHARACTER TO PATAK -->
-            <Key latin:keySpec="&#x0E0F;" />
-            <!-- U+0E42: "โ" THAI CHARACTER SARA O -->
-            <Key latin:keySpec="&#x0E42;" />
-            <!-- U+0E0C: "ฌ" THAI CHARACTER CHO CHOE -->
-            <Key latin:keySpec="&#x0E0C;" />
-            <!-- U+0020: " " SPACE
-                 U+0E47: " ็" THAI CHARACTER MAITAIKHU -->
-            <!-- Note: The space character is needed as a preceding letter to draw some Thai
-                 composing characters correctly. -->
-            <Key
-                latin:keySpec="&#x20;&#x0E47;|&#x0E47;"
-                latin:keyLabelFlags="followKeyLetterRatio" />
-            <!-- U+0020: " " SPACE
-                 U+0E4B: " ๋" THAI CHARACTER MAI CHATTAWA -->
-            <!-- Note: The space character is needed as a preceding letter to draw some Thai
-                 composing characters correctly. -->
-            <Key
-                latin:keySpec="&#x20;&#x0E4B;|&#x0E4B;"
-                latin:keyLabelFlags="followKeyLetterRatio" />
-            <!-- U+0E29: "ษ" THAI CHARACTER SO RUSI -->
-            <Key latin:keySpec="&#x0E29;" />
-            <!-- U+0E28: "ศ" THAI CHARACTER SO SALA -->
-            <Key latin:keySpec="&#x0E28;" />
-            <!-- U+0E0B: "ซ" THAI CHARACTER SO SO -->
-            <Key latin:keySpec="&#x0E0B;" />
-            <Key
-                latin:keySpec="."
-                latin:keyLabelFlags="fontDefault" />
-        </case>
-        <default>
-            <!-- U+0E1F: "ฟ" THAI CHARACTER FO FAN -->
-            <Key latin:keySpec="&#x0E1F;" />
-            <!-- U+0E2B: "ห" THAI CHARACTER HO HIP -->
-            <Key latin:keySpec="&#x0E2B;" />
-            <!-- U+0E01: "ก" THAI CHARACTER KO KAI -->
-            <Key latin:keySpec="&#x0E01;" />
-            <!-- U+0E14: "ด" THAI CHARACTER DO DEK -->
-            <Key latin:keySpec="&#x0E14;" />
-            <!-- U+0E40: "เ" THAI CHARACTER SARA E -->
-            <Key latin:keySpec="&#x0E40;" />
-            <!-- U+0020: " " SPACE
-                 U+0E49: " ้" THAI CHARACTER MAI THO -->
-            <!-- Note: The space character is needed as a preceding letter to draw some Thai
-                 composing characters correctly. -->
-            <Key
-                latin:keySpec="&#x20;&#x0E49;|&#x0E49;"
-                latin:keyLabelFlags="followKeyLetterRatio" />
-            <!-- U+0020: " " SPACE
-                 U+0E48: " ่" THAI CHARACTER MAI EK -->
-            <!-- Note: The space character is needed as a preceding letter to draw some Thai
-                 composing characters correctly. -->
-            <Key
-                latin:keySpec="&#x20;&#x0E48;|&#x0E48;"
-                latin:keyLabelFlags="followKeyLetterRatio" />
-            <!-- U+0E32: "า" THAI CHARACTER SARA AA -->
-            <Key latin:keySpec="&#x0E32;" />
-            <!-- U+0E2A: "ส" THAI CHARACTER SO SUA -->
-            <Key latin:keySpec="&#x0E2A;" />
-            <!-- U+0E27: "ว" THAI CHARACTER WO WAEN -->
-            <Key latin:keySpec="&#x0E27;" />
-            <!-- U+0E07: "ง" THAI CHARACTER NGO NGU -->
-            <Key latin:keySpec="&#x0E07;" />
-        </default>
-    </switch>
-</merge>
diff --git a/java/res/xml/rowkeys_thai4.xml b/java/res/xml/rowkeys_thai4.xml
deleted file mode 100644
index 3e70d7e82..000000000
--- a/java/res/xml/rowkeys_thai4.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <switch>
-        <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
-            <Key
-                latin:keySpec="("
-                latin:keyLabelFlags="fontDefault" />
-            <Key
-                latin:keySpec=")"
-                latin:keyLabelFlags="fontDefault" />
-            <!-- U+0E09: "ฉ" THAI CHARACTER CHO CHING -->
-            <Key latin:keySpec="&#x0E09;" />
-            <!-- U+0E2E: "ฮ" THAI CHARACTER HO NOKHUK -->
-            <Key latin:keySpec="&#x0E2E;" />
-            <!-- U+0020: " " SPACE
-                 U+0E3A: " ฺ" THAI CHARACTER PHINTHU -->
-            <!-- Note: The space character is needed as a preceding letter to draw some Thai
-                 composing characters correctly. -->
-            <Key
-                latin:keySpec="&#x20;&#x0E3A;|&#x0E3A;"
-                latin:keyLabelFlags="followKeyLetterRatio" />
-            <!-- U+0020: " " SPACE
-                 U+0E4C: " ์" THAI CHARACTER THANTHAKHAT -->
-            <!-- Note: The space character is needed as a preceding letter to draw some Thai
-                 composing characters correctly. -->
-            <Key
-                latin:keySpec="&#x20;&#x0E4C;|&#x0E4C;"
-                latin:keyLabelFlags="followKeyLetterRatio" />
-            <Key
-                latin:keySpec="\?"
-                latin:keyLabelFlags="fontDefault" />
-            <!-- U+0E12: "ฒ" THAI CHARACTER THO PHUTHAO -->
-            <Key latin:keySpec="&#x0E12;" />
-            <!-- U+0E2C: "ฬ" THAI CHARACTER LO CHULA -->
-            <Key latin:keySpec="&#x0E2C;" />
-            <!-- U+0E26: "ฦ" THAI CHARACTER LU -->
-            <Key latin:keySpec="&#x0E26;" />
-        </case>
-        <default>
-            <!-- U+0E1C: "ผ" THAI CHARACTER PHO PHUNG -->
-            <Key latin:keySpec="&#x0E1C;" />
-            <!-- U+0E1B: "ป" THAI CHARACTER PO PLA -->
-            <Key latin:keySpec="&#x0E1B;" />
-            <!-- U+0E41: "แ" THAI CHARACTER SARA AE -->
-            <Key latin:keySpec="&#x0E41;" />
-            <!-- U+0E2D: "อ" THAI CHARACTER O ANG -->
-            <Key latin:keySpec="&#x0E2D;" />
-            <!-- U+0020: " " SPACE
-                 U+0E34: " ิ" THAI CHARACTER SARA I -->
-            <!-- Note: The space character is needed as a preceding letter to draw some Thai
-                 composing characters correctly. -->
-            <Key
-                latin:keySpec="&#x20;&#x0E34;|&#x0E34;"
-                latin:keyLabelFlags="followKeyLetterRatio" />
-            <!-- U+0020: " " SPACE
-                 U+0E37: " ื" THAI CHARACTER SARA UEE -->
-            <!-- Note: The space character is needed as a preceding letter to draw some Thai
-                 composing characters correctly. -->
-            <Key
-                latin:keySpec="&#x20;&#x0E37;|&#x0E37;"
-                latin:keyLabelFlags="followKeyLetterRatio" />
-            <!-- U+0E17: "ท" THAI CHARACTER THO THAHAN -->
-            <Key latin:keySpec="&#x0E17;" />
-            <!-- U+0E21: "ม" THAI CHARACTER MO MA -->
-            <Key latin:keySpec="&#x0E21;" />
-            <!-- U+0E43: "ใ" THAI CHARACTER SARA AI MAIMUAN -->
-            <Key latin:keySpec="&#x0E43;" />
-            <!-- U+0E1D: "ฝ" THAI CHARACTER FO FA -->
-            <Key latin:keySpec="&#x0E1D;" />
-        </default>
-    </switch>
-</merge>
diff --git a/java/res/xml/rowkeys_turkish1.xml b/java/res/xml/rowkeys_turkish1.xml
deleted file mode 100644
index ee69f47a2..000000000
--- a/java/res/xml/rowkeys_turkish1.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2014, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <Key
-        latin:keySpec="!text/keyspec_q"
-        latin:moreKeys="!text/morekeys_q,!text/qwertysyms_q,!text/number_1" />
-    <Key
-        latin:keySpec="!text/keyspec_w"
-        latin:moreKeys="!text/morekeys_w,!text/qwertysyms_w,!text/number_2" />
-    <Key
-        latin:keySpec="e"
-        latin:moreKeys="!text/morekeys_e,!text/qwertysyms_e,!text/number_3" />
-    <Key
-        latin:keySpec="r"
-        latin:moreKeys="!text/morekeys_r,!text/qwertysyms_r,!text/number_4" />
-    <Key
-        latin:keySpec="t"
-        latin:moreKeys="!text/morekeys_t,!text/qwertysyms_t,!text/number_5" />
-    <Key
-        latin:keySpec="!text/keyspec_y"
-        latin:moreKeys="!text/morekeys_y,!text/qwertysyms_y,!text/number_6" />
-    <Key
-        latin:keySpec="u"
-        latin:moreKeys="!text/morekeys_u,!text/qwertysyms_u,!text/number_7" />
-
-    <!-- U+0131: "ı" LATIN SMALL LETTER DOTLESS I -->
-    <Key
-        latin:keySpec="&#x0131;"
-        latin:moreKeys="!text/morekeys_i,!text/qwertysyms_i,!text/number_8" />
-    <Key
-        latin:keySpec="o"
-        latin:moreKeys="!text/morekeys_o,!text/qwertysyms_o,!text/number_9" />
-    <Key
-        latin:keySpec="p"
-        latin:moreKeys="!text/morekeys_p,!text/qwertysyms_p,!text/number_0" />
-
-    <!-- U+011F: "ğ" LATIN SMALL LETTER G WITH BREVE
-         U+0123: "ģ" LATIN SMALL LETTER G WITH CEDILLA -->
-    <Key
-        latin:keySpec="&#x011F;"
-        latin:keyHintLabel="&#x0123;"
-        latin:additionalMoreKeys="!text/morekeys_g" />
-
-    <!-- U+00FC: "ü" LATIN SMALL LETTER U WITH DIAERESIS
-         U+00FA: "ú" LATIN SMALL LETTER U WITH ACUTE-->
-    <Key
-        latin:keySpec="&#x00FC;"
-        latin:keyHintLabel="&#x00FA;"
-        latin:moreKeys="!text/morekeys_u" />
-</merge>
diff --git a/java/res/xml/rowkeys_turkish2.xml b/java/res/xml/rowkeys_turkish2.xml
deleted file mode 100644
index cc2ebf7f2..000000000
--- a/java/res/xml/rowkeys_turkish2.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <include
-        latin:keyboardLayout="@xml/rowkeys_qwerty2" />
-
-    <!-- U+015F: "ş" LATIN SMALL LETTER S WITH CEDILLA
-         U+015B: "ś" LATIN SMALL LETTER S WITH ACUTE-->
-    <Key
-        latin:keySpec="&#x015F;"
-        latin:keyHintLabel="&#x015B;"
-        latin:moreKeys="!text/morekeys_s" />
-
-    <!-- U+00ED: "í" LATIN SMALL LETTER I WITH ACUTE -->
-    <Key
-        latin:keySpec="i"
-        latin:keyHintLabel="&#x00ED;"
-        latin:additionalMoreKeys="!text/morekeys_i" />
-</merge>
\ No newline at end of file
diff --git a/java/res/xml/rowkeys_turkish3.xml b/java/res/xml/rowkeys_turkish3.xml
deleted file mode 100644
index 020e0f31f..000000000
--- a/java/res/xml/rowkeys_turkish3.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <include
-        latin:keyboardLayout="@xml/rowkeys_qwerty3" />
-
-    <!-- U+00F6: "ö" LATIN SMALL LETTER O WITH DIAERESIS
-         U+00F3: "ó" LATIN SMALL LETTER O WITH ACUTE -->
-    <Key
-        latin:keySpec="&#x00F6;"
-        latin:keyHintLabel="&#x00F3;"
-        latin:moreKeys="!text/morekeys_o" />
-
-    <!-- U+00E7: "ç" LATIN SMALL LETTER C WITH CEDILLA
-         U+0107: "ć" LATIN SMALL LETTER C WITH ACUTE -->
-    <Key
-        latin:keySpec="&#x00E7;"
-        latin:keyHintLabel="&#x0107;"
-        latin:additionalMoreKeys="!text/morekeys_c" />
-</merge>
\ No newline at end of file
diff --git a/java/res/xml/rowkeys_uzbek1.xml b/java/res/xml/rowkeys_uzbek1.xml
deleted file mode 100644
index 1a12d3379..000000000
--- a/java/res/xml/rowkeys_uzbek1.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2014, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto" >
-    <include latin:keyboardLayout="@xml/rowkeys_qwerty1" />
-    <!-- U+006F/U+02BB: "oʻ" LATIN SMALL LETTER O/MODIFIER LETTER TURNED COMMA -->
-    <Key
-        latin:keySpec="o&#x02BB;"
-        latin:keyLabelFlags="followKeyLetterRatio" />
-</merge>
\ No newline at end of file
diff --git a/java/res/xml/rowkeys_uzbek2.xml b/java/res/xml/rowkeys_uzbek2.xml
deleted file mode 100644
index 171482b67..000000000
--- a/java/res/xml/rowkeys_uzbek2.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2014, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto" >
-    <include latin:keyboardLayout="@xml/rowkeys_qwerty2" />
-    <!-- U+0067/U+02BB: "gʻ" LATIN SMALL LETTER G/MODIFIER LETTER TURNED COMMA -->
-    <Key
-        latin:keySpec="g&#x02BB;"
-        latin:keyLabelFlags="followKeyLetterRatio" />
-    <!-- U+02BC: "ʼ" MODIFIER LETTER APOSTROPHE -->
-    <Key latin:keySpec="&#x02BC;" />
-</merge>
\ No newline at end of file
diff --git a/java/res/xml/rows_arabic.xml b/java/res/xml/rows_arabic.xml
deleted file mode 100644
index 62c2ea60d..000000000
--- a/java/res/xml/rows_arabic.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2011, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <include latin:keyboardLayout="@xml/key_styles_common" />
-    <include latin:keyboardLayout="@xml/row_number_switch" />
-    <Row
-        latin:keyWidth="9.091%p"
-        latin:keyLabelFlags="fontNormal"
-    >
-        <include latin:keyboardLayout="@xml/rowkeys_arabic1" />
-    </Row>
-    <Row
-        latin:keyWidth="9.091%p"
-        latin:keyLabelFlags="fontNormal"
-    >
-        <include latin:keyboardLayout="@xml/rowkeys_arabic2" />
-    </Row>
-    <Row
-        latin:keyWidth="9.091%p"
-        latin:keyLabelFlags="fontNormal"
-    >
-        <include latin:keyboardLayout="@xml/rowkeys_arabic3" />
-        <Key
-            latin:keyStyle="deleteKeyStyle"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <include latin:keyboardLayout="@xml/row_qwerty4" />
-</merge>
diff --git a/java/res/xml/rows_armenian_phonetic.xml b/java/res/xml/rows_armenian_phonetic.xml
deleted file mode 100644
index 5c824f6db..000000000
--- a/java/res/xml/rows_armenian_phonetic.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2013, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <include latin:keyboardLayout="@xml/key_styles_common" />
-    <include latin:keyboardLayout="@xml/key_styles_currency" />
-    <include latin:keyboardLayout="@xml/row_number_switch" />
-    <Row
-        latin:keyWidth="10.0%p"
-        latin:keyLabelFlags="fontNormal"
-    >
-        <include latin:keyboardLayout="@xml/rowkeys_armenian_phonetic1" />
-    </Row>
-    <Row
-        latin:keyWidth="10.0%p"
-        latin:keyLabelFlags="fontNormal"
-    >
-        <include latin:keyboardLayout="@xml/rowkeys_armenian_phonetic2" />
-    </Row>
-    <Row
-        latin:keyWidth="10.0%p"
-        latin:keyLabelFlags="fontNormal"
-    >
-        <include latin:keyboardLayout="@xml/rowkeys_armenian_phonetic3" />
-        <include latin:keyboardLayout="@xml/key_armenian_xeh" />
-    </Row>
-    <Row
-        latin:keyWidth="9.8000%p"
-        latin:keyLabelFlags="fontNormal"
-    >
-        <Key
-            latin:keyStyle="shiftKeyStyle"
-            latin:keyWidth="10.8%p" />
-        <include latin:keyboardLayout="@xml/rowkeys_armenian_phonetic4" />
-        <include latin:keyboardLayout="@xml/key_armenian_sha" />
-        <Key
-            latin:keyStyle="deleteKeyStyle"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <include latin:keyboardLayout="@xml/row_qwerty4" />
-</merge>
diff --git a/java/res/xml/rows_azerty.xml b/java/res/xml/rows_azerty.xml
deleted file mode 100644
index 04795a021..000000000
--- a/java/res/xml/rows_azerty.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2010, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <include
-        latin:keyboardLayout="@xml/key_styles_common" />
-    <include latin:keyboardLayout="@xml/row_number_switch" />
-    <Row
-        latin:keyWidth="10%p"
-    >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_azerty1" />
-    </Row>
-    <Row
-        latin:keyWidth="10%p"
-    >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_azerty2" />
-    </Row>
-    <Row
-        latin:keyWidth="10%p"
-    >
-        <Key
-            latin:keyStyle="shiftKeyStyle"
-            latin:keyWidth="15%p"
-            latin:visualInsetsRight="1%p" />
-        <include
-            latin:keyboardLayout="@xml/rowkeys_azerty3" />
-        <Key
-            latin:keyStyle="deleteKeyStyle"
-            latin:keyWidth="fillRight"
-            latin:visualInsetsLeft="1%p" />
-    </Row>
-    <include
-        latin:keyboardLayout="@xml/row_qwerty4" />
-</merge>
diff --git a/java/res/xml/rows_bengali.xml b/java/res/xml/rows_bengali.xml
deleted file mode 100644
index e53ef735d..000000000
--- a/java/res/xml/rows_bengali.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2014, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <include latin:keyboardLayout="@xml/key_styles_common" />
-    <include latin:keyboardLayout="@xml/row_number_switch" />
-    <Row
-        latin:keyWidth="9.091%p"
-        latin:keyLabelFlags="fontNormal"
-    >
-        <include latin:keyboardLayout="@xml/rowkeys_bengali1" />
-    </Row>
-    <Row
-        latin:keyWidth="9.091%p"
-        latin:keyLabelFlags="fontNormal"
-    >
-        <include latin:keyboardLayout="@xml/rowkeys_bengali2" />
-    </Row>
-    <Row
-        latin:keyWidth="9.091%p"
-        latin:keyLabelFlags="fontNormal"
-    >
-        <include latin:keyboardLayout="@xml/rowkeys_bengali3" />
-        <Key
-            latin:keyStyle="deleteKeyStyle"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <include latin:keyboardLayout="@xml/row_qwerty4" />
-</merge>
diff --git a/java/res/xml/rows_bengali_akkhor.xml b/java/res/xml/rows_bengali_akkhor.xml
deleted file mode 100644
index 837eb6eb3..000000000
--- a/java/res/xml/rows_bengali_akkhor.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2014, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto" >
-    <include latin:keyboardLayout="@xml/key_styles_common" />
-    <include latin:keyboardLayout="@xml/row_number_switch" />
-    <Row
-        latin:keyLabelFlags="fontNormal"
-        latin:keyWidth="9.091%p" >
-        <include latin:keyboardLayout="@xml/rowkeys_bengali_akkhor1" />
-    </Row>
-    <Row
-        latin:keyLabelFlags="fontNormal"
-        latin:keyWidth="9.091%p" >
-        <include latin:keyboardLayout="@xml/rowkeys_bengali_akkhor2" />
-    </Row>
-    <Row
-        latin:keyLabelFlags="fontNormal"
-        latin:keyWidth="8.711%p" >
-        <Key
-            latin:keyStyle="shiftKeyStyle"
-            latin:keyWidth="10.8%p" />
-        <include latin:keyboardLayout="@xml/rowkeys_bengali_akkhor3" />
-        <Key
-            latin:keyStyle="deleteKeyStyle"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <include latin:keyboardLayout="@xml/row_qwerty4" />
-</merge>
diff --git a/java/res/xml/rows_bepo.xml b/java/res/xml/rows_bepo.xml
deleted file mode 100644
index a021abe6e..000000000
--- a/java/res/xml/rows_bepo.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2015 The CyanogenMod Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <include
-        latin:keyboardLayout="@xml/key_styles_common" />
-    <include latin:keyboardLayout="@xml/row_number_switch" />
-    <Row
-        latin:keyWidth="10%p"
-    >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_bepo1" />
-    </Row>
-    <Row
-        latin:keyWidth="10%p"
-    >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_bepo2" />
-    </Row>
-    <Row
-        latin:keyWidth="10%p"
-    >
-        <Key
-            latin:keyStyle="shiftKeyStyle"
-            latin:keyWidth="15%p"
-            latin:visualInsetsRight="1%p" />
-        <include
-            latin:keyboardLayout="@xml/rowkeys_bepo3" />
-        <Key
-            latin:keyStyle="deleteKeyStyle"
-            latin:keyWidth="fillRight"
-            latin:visualInsetsLeft="1%p" />
-    </Row>
-    <include
-        latin:keyboardLayout="@xml/row_qwerty4" />
-</merge>
diff --git a/java/res/xml/rows_bulgarian.xml b/java/res/xml/rows_bulgarian.xml
deleted file mode 100644
index 99c5395a3..000000000
--- a/java/res/xml/rows_bulgarian.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <include
-        latin:keyboardLayout="@xml/key_styles_common" />
-    <include latin:keyboardLayout="@xml/row_number_switch" />
-    <Row
-        latin:keyWidth="9.091%p"
-    >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_bulgarian1" />
-    </Row>
-    <Row
-            latin:keyWidth="9.091%p"
-    >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_bulgarian2" />
-    </Row>
-    <Row
-        latin:keyWidth="9.091%p"
-    >
-        <Key
-            latin:keyStyle="shiftKeyStyle"
-            latin:keyWidth="13.636%p" />
-        <include
-            latin:keyboardLayout="@xml/rowkeys_bulgarian3" />
-        <Key
-            latin:keyStyle="deleteKeyStyle"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <include
-        latin:keyboardLayout="@xml/row_qwerty4" />
-</merge>
diff --git a/java/res/xml/rows_bulgarian_bds.xml b/java/res/xml/rows_bulgarian_bds.xml
deleted file mode 100644
index 2c4dba127..000000000
--- a/java/res/xml/rows_bulgarian_bds.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <include
-        latin:keyboardLayout="@xml/key_styles_common" />
-    <include latin:keyboardLayout="@xml/row_number_switch" />
-    <Row
-        latin:keyWidth="9.091%p"
-    >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_bulgarian_bds1" />
-    </Row>
-    <Row
-            latin:keyWidth="9.091%p"
-    >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_bulgarian_bds2" />
-    </Row>
-    <Row
-        latin:keyWidth="8.711%p"
-    >
-        <Key
-            latin:keyStyle="shiftKeyStyle"
-            latin:keyWidth="10.8%p" />
-        <include
-            latin:keyboardLayout="@xml/rowkeys_bulgarian_bds3" />
-        <Key
-            latin:keyStyle="deleteKeyStyle"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <include
-        latin:keyboardLayout="@xml/row_qwerty4" />
-</merge>
diff --git a/java/res/xml/rows_colemak.xml b/java/res/xml/rows_colemak.xml
deleted file mode 100644
index 190566e4b..000000000
--- a/java/res/xml/rows_colemak.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <include
-        latin:keyboardLayout="@xml/key_styles_common" />
-    <include latin:keyboardLayout="@xml/row_number_switch" />
-    <Row
-        latin:keyWidth="10%p"
-    >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_colemak1" />
-    </Row>
-    <Row
-        latin:keyWidth="10%p"
-    >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_colemak2" />
-    </Row>
-    <Row
-        latin:keyWidth="10%p"
-    >
-        <Key
-            latin:keyStyle="shiftKeyStyle"
-            latin:keyWidth="15%p"
-            latin:visualInsetsRight="1%p" />
-        <include
-            latin:keyboardLayout="@xml/rowkeys_colemak3" />
-        <Key
-            latin:keyStyle="deleteKeyStyle"
-            latin:keyWidth="fillRight"
-            latin:visualInsetsLeft="1%p" />
-    </Row>
-    <include
-        latin:keyboardLayout="@xml/row_qwerty4" />
-</merge>
diff --git a/java/res/xml/rows_dvorak.xml b/java/res/xml/rows_dvorak.xml
deleted file mode 100644
index 10ed0ebbd..000000000
--- a/java/res/xml/rows_dvorak.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <include
-        latin:keyboardLayout="@xml/key_styles_common" />
-    <include latin:keyboardLayout="@xml/row_number_switch" />
-    <Row
-        latin:keyWidth="10%p"
-    >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_dvorak1" />
-        </Row>
-    <Row
-        latin:keyWidth="10%p"
-    >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_dvorak2" />
-    </Row>
-    <Row
-        latin:keyWidth="10%p"
-    >
-        <Key
-            latin:keyStyle="shiftKeyStyle"
-            latin:keyWidth="15%p"
-            latin:visualInsetsRight="1%p" />
-        <include
-            latin:keyboardLayout="@xml/rowkeys_dvorak3" />
-        <Key
-            latin:keyStyle="deleteKeyStyle"
-            latin:keyWidth="fillRight"
-            latin:visualInsetsLeft="1%p" />
-    </Row>
-    <!-- Dvorak layout shares almost the same row with Qwerty layout.
-         The difference is defined in xml/row_qwerty4.xml. -->
-    <include
-        latin:keyboardLayout="@xml/row_qwerty4" />
-</merge>
diff --git a/java/res/xml/rows_east_slavic.xml b/java/res/xml/rows_east_slavic.xml
deleted file mode 100644
index a12118e1d..000000000
--- a/java/res/xml/rows_east_slavic.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2011, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <include
-        latin:keyboardLayout="@xml/key_styles_common" />
-    <include latin:keyboardLayout="@xml/row_number_switch" />
-    <Row
-        latin:keyWidth="9.091%p"
-    >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_east_slavic1" />
-    </Row>
-    <Row
-            latin:keyWidth="9.091%p"
-    >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_east_slavic2" />
-    </Row>
-    <Row
-        latin:keyWidth="8.711%p"
-    >
-        <Key
-            latin:keyStyle="shiftKeyStyle"
-            latin:keyWidth="10.8%p" />
-        <include
-            latin:keyboardLayout="@xml/rowkeys_east_slavic3" />
-        <Key
-            latin:keyStyle="deleteKeyStyle"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <include
-        latin:keyboardLayout="@xml/row_qwerty4" />
-</merge>
diff --git a/java/res/xml/rows_east_slavic_phonetic.xml b/java/res/xml/rows_east_slavic_phonetic.xml
deleted file mode 100644
index cd73ab866..000000000
--- a/java/res/xml/rows_east_slavic_phonetic.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2011, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <include
-        latin:keyboardLayout="@xml/key_styles_common" />
-    <include latin:keyboardLayout="@xml/row_number_switch" />
-    <Row
-        latin:keyWidth="10%p"
-    >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_east_slavic_phonetic1" />
-    </Row>
-    <Row
-            latin:keyWidth="10%p"
-    >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_east_slavic_phonetic2"
-            latin:keyXPos="5%p" />
-    </Row>
-    <Row
-        latin:keyWidth="10%p"
-    >
-        <Key
-            latin:keyStyle="shiftKeyStyle"
-            latin:keyWidth="15%p"
-            latin:visualInsetsRight="1%p" />
-        <include
-            latin:keyboardLayout="@xml/rowkeys_east_slavic_phonetic3" />
-        <Key
-            latin:keyStyle="deleteKeyStyle"
-            latin:keyWidth="fillRight"
-            latin:visualInsetsLeft="1%p" />
-    </Row>
-    <include
-        latin:keyboardLayout="@xml/row_qwerty4" />
-</merge>
diff --git a/java/res/xml/rows_farsi.xml b/java/res/xml/rows_farsi.xml
deleted file mode 100644
index c4a00f947..000000000
--- a/java/res/xml/rows_farsi.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <include latin:keyboardLayout="@xml/key_styles_common" />
-    <include latin:keyboardLayout="@xml/row_number_switch" />
-    <Row
-        latin:keyWidth="9.091%p"
-        latin:keyLabelFlags="fontNormal"
-    >
-        <include latin:keyboardLayout="@xml/rowkeys_farsi1" />
-    </Row>
-    <Row
-        latin:keyWidth="9.091%p"
-        latin:keyLabelFlags="fontNormal"
-    >
-        <include latin:keyboardLayout="@xml/rowkeys_farsi2" />
-    </Row>
-    <Row
-        latin:keyWidth="9.091%p"
-        latin:keyLabelFlags="fontNormal"
-    >
-        <include latin:keyboardLayout="@xml/rowkeys_farsi3" />
-        <Key
-            latin:keyStyle="deleteKeyStyle"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <include latin:keyboardLayout="@xml/row_qwerty4" />
-</merge>
diff --git a/java/res/xml/rows_georgian.xml b/java/res/xml/rows_georgian.xml
deleted file mode 100644
index 4f4709bed..000000000
--- a/java/res/xml/rows_georgian.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <include
-        latin:keyboardLayout="@xml/key_styles_common" />
-    <include latin:keyboardLayout="@xml/row_number_switch" />
-    <Row
-        latin:keyWidth="10%p"
-    >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_georgian1" />
-    </Row>
-    <Row
-        latin:keyWidth="10%p"
-    >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_georgian2"
-            latin:keyXPos="5%p" />
-    </Row>
-    <Row
-        latin:keyWidth="10%p"
-    >
-        <Key
-            latin:keyStyle="shiftKeyStyle"
-            latin:keyWidth="15%p"
-            latin:visualInsetsRight="1%p" />
-        <include
-            latin:keyboardLayout="@xml/rowkeys_georgian3" />
-        <Key
-            latin:keyStyle="deleteKeyStyle"
-            latin:keyWidth="fillRight"
-            latin:visualInsetsLeft="1%p" />
-    </Row>
-    <include
-        latin:keyboardLayout="@xml/row_qwerty4" />
-</merge>
diff --git a/java/res/xml/rows_greek.xml b/java/res/xml/rows_greek.xml
deleted file mode 100644
index 8026452f1..000000000
--- a/java/res/xml/rows_greek.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <include
-        latin:keyboardLayout="@xml/key_styles_common" />
-    <include latin:keyboardLayout="@xml/row_number_switch" />
-    <Row
-        latin:keyWidth="10%p"
-    >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_greek1" />
-    </Row>
-    <Row
-        latin:keyWidth="10%p"
-    >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_greek2"
-            latin:keyXPos="5%p" />
-    </Row>
-    <Row
-        latin:keyWidth="10%p"
-    >
-        <Key
-            latin:keyStyle="shiftKeyStyle"
-            latin:keyWidth="15%p"
-            latin:visualInsetsRight="1%p" />
-        <include
-            latin:keyboardLayout="@xml/rowkeys_greek3" />
-        <Key
-            latin:keyStyle="deleteKeyStyle"
-            latin:keyWidth="fillRight"
-            latin:visualInsetsLeft="1%p" />
-    </Row>
-    <include
-        latin:keyboardLayout="@xml/row_qwerty4" />
-</merge>
diff --git a/java/res/xml/rows_hebrew.xml b/java/res/xml/rows_hebrew.xml
deleted file mode 100644
index 770afe4f8..000000000
--- a/java/res/xml/rows_hebrew.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2011, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <include
-        latin:keyboardLayout="@xml/key_styles_common" />
-    <include latin:keyboardLayout="@xml/row_number_switch" />
-    <Row
-        latin:keyWidth="10%p"
-    >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_hebrew1" />
-    </Row>
-    <Row
-        latin:keyWidth="10%p"
-    >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_hebrew2" />
-    </Row>
-    <Row
-        latin:keyWidth="10%p"
-    >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_hebrew3" />
-        <Key
-            latin:keyStyle="deleteKeyStyle"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <include
-        latin:keyboardLayout="@xml/row_qwerty4" />
-</merge>
diff --git a/java/res/xml/rows_hindi.xml b/java/res/xml/rows_hindi.xml
deleted file mode 100644
index e9b8df681..000000000
--- a/java/res/xml/rows_hindi.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <include latin:keyboardLayout="@xml/key_styles_common" />
-    <include latin:keyboardLayout="@xml/row_number_switch" />
-    <Row
-        latin:keyWidth="9.091%p"
-        latin:keyLabelFlags="fontNormal"
-    >
-        <include latin:keyboardLayout="@xml/rowkeys_hindi1" />
-    </Row>
-    <Row
-        latin:keyWidth="9.091%p"
-        latin:keyLabelFlags="fontNormal"
-    >
-        <include latin:keyboardLayout="@xml/rowkeys_hindi2" />
-    </Row>
-    <Row
-        latin:keyWidth="8.711%p"
-        latin:keyLabelFlags="fontNormal"
-    >
-        <Key
-            latin:keyStyle="shiftKeyStyle"
-            latin:keyWidth="10.8%p" />
-        <include latin:keyboardLayout="@xml/rowkeys_hindi3" />
-        <Key
-            latin:keyStyle="deleteKeyStyle"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <include latin:keyboardLayout="@xml/row_qwerty4" />
-</merge>
diff --git a/java/res/xml/rows_hindi_compact.xml b/java/res/xml/rows_hindi_compact.xml
deleted file mode 100644
index 32ae7a5d8..000000000
--- a/java/res/xml/rows_hindi_compact.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2014, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <include latin:keyboardLayout="@xml/key_styles_common" />
-    <include latin:keyboardLayout="@xml/row_number_switch" />
-    <Row
-        latin:keyWidth="9.091%p"
-        latin:keyLabelFlags="fontNormal"
-    >
-        <include latin:keyboardLayout="@xml/rowkeys_hindi_compact1" />
-    </Row>
-    <Row
-        latin:keyWidth="9.091%p"
-        latin:keyLabelFlags="fontNormal"
-    >
-        <include latin:keyboardLayout="@xml/rowkeys_hindi_compact2" />
-    </Row>
-    <Row
-        latin:keyWidth="9.091%p"
-        latin:keyLabelFlags="fontNormal"
-    >
-        <include latin:keyboardLayout="@xml/rowkeys_hindi_compact3" />
-        <Key
-            latin:keyStyle="deleteKeyStyle"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <include latin:keyboardLayout="@xml/row_qwerty4" />
-</merge>
diff --git a/java/res/xml/rows_kannada.xml b/java/res/xml/rows_kannada.xml
deleted file mode 100644
index ab77bf9b3..000000000
--- a/java/res/xml/rows_kannada.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2014, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <include latin:keyboardLayout="@xml/key_styles_common" />
-    <include latin:keyboardLayout="@xml/row_number_switch" />
-    <Row
-        latin:keyWidth="9.091%p"
-        latin:keyLabelFlags="fontNormal|autoXScale"
-    >
-        <include latin:keyboardLayout="@xml/rowkeys_kannada1" />
-    </Row>
-    <Row
-        latin:keyWidth="9.091%p"
-        latin:keyLabelFlags="fontNormal|autoXScale"
-    >
-        <include latin:keyboardLayout="@xml/rowkeys_kannada2" />
-    </Row>
-    <Row
-        latin:keyWidth="9.091%p"
-        latin:keyLabelFlags="fontNormal|autoXScale"
-    >
-        <include latin:keyboardLayout="@xml/rowkeys_kannada3" />
-        <Key
-            latin:keyStyle="deleteKeyStyle"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <include latin:keyboardLayout="@xml/row_qwerty4" />
-</merge>
\ No newline at end of file
diff --git a/java/res/xml/rows_khmer.xml b/java/res/xml/rows_khmer.xml
deleted file mode 100644
index 271b757a9..000000000
--- a/java/res/xml/rows_khmer.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2013, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <include latin:keyboardLayout="@xml/key_styles_common" />
-    <include latin:keyboardLayout="@xml/row_number_switch" />
-    <Row
-        latin:keyWidth="8.3333%p"
-        latin:keyLabelFlags="fontNormal|autoXScale"
-    >
-        <include latin:keyboardLayout="@xml/rowkeys_khmer1" />
-    </Row>
-    <Row
-        latin:keyWidth="8.3333%p"
-        latin:keyLabelFlags="fontNormal|autoXScale"
-    >
-        <include latin:keyboardLayout="@xml/rowkeys_khmer2" />
-    </Row>
-    <Row
-        latin:keyWidth="8.3333%p"
-        latin:keyLabelFlags="fontNormal|autoXScale"
-    >
-        <include latin:keyboardLayout="@xml/rowkeys_khmer3" />
-    </Row>
-    <Row
-        latin:keyWidth="8.3333%p"
-        latin:keyLabelFlags="fontNormal|autoXScale"
-    >
-        <Key latin:keyStyle="shiftKeyStyle" />
-        <include latin:keyboardLayout="@xml/rowkeys_khmer4" />
-        <Key latin:keyStyle="deleteKeyStyle" />
-    </Row>
-    <include latin:keyboardLayout="@xml/row_qwerty4" />
-</merge>
diff --git a/java/res/xml/rows_kurdish.xml b/java/res/xml/rows_kurdish.xml
deleted file mode 100644
index 7cad9f712..000000000
--- a/java/res/xml/rows_kurdish.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2011, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <include latin:keyboardLayout="@xml/key_styles_common" />
-    <include latin:keyboardLayout="@xml/row_number_arabic_switch" />
-    <Row
-        latin:keyWidth="10%p"
-        latin:keyLabelFlags="fontNormal"
-    >
-        <include latin:keyboardLayout="@xml/rowkeys_kurdish1" />
-    </Row>
-    <Row
-        latin:keyWidth="10%p"
-        latin:keyLabelFlags="fontNormal"
-    >
-        <include latin:keyboardLayout="@xml/rowkeys_kurdish2"
-            latin:keyXPos="5%p"/>
-
-    </Row>
-    <Row
-        latin:keyWidth="10%p"
-        latin:keyLabelFlags="fontNormal"
-    >
-        <Key
-            latin:keyStyle="shiftKeyStyle"
-            latin:keyWidth="15%p"
-            latin:visualInsetsRight="1%p" />
-        <include latin:keyboardLayout="@xml/rowkeys_kurdish3"
-           />
-        <Key
-            latin:keyStyle="deleteKeyStyle"
-            latin:keyWidth="fillRight"
-            />
-    </Row>
-    <include latin:keyboardLayout="@xml/row_qwerty4" />
-</merge>
diff --git a/java/res/xml/rows_lao.xml b/java/res/xml/rows_lao.xml
deleted file mode 100644
index 9fa6d16a3..000000000
--- a/java/res/xml/rows_lao.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2013, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <include latin:keyboardLayout="@xml/key_styles_common" />
-    <include latin:keyboardLayout="@xml/row_number_switch" />
-    <Row
-        latin:keyWidth="8.3333%p"
-        latin:keyLabelFlags="fontNormal"
-    >
-        <include latin:keyboardLayout="@xml/rowkeys_lao1" />
-    </Row>
-    <Row
-        latin:keyWidth="8.3333%p"
-        latin:keyLabelFlags="fontNormal"
-    >
-        <include latin:keyboardLayout="@xml/rowkeys_lao2" />
-    </Row>
-    <Row
-        latin:keyWidth="8.3333%p"
-        latin:keyLabelFlags="fontNormal"
-    >
-        <include latin:keyboardLayout="@xml/rowkeys_lao3" />
-    </Row>
-    <Row
-        latin:keyWidth="8.3333%p"
-        latin:keyLabelFlags="fontNormal"
-    >
-        <Key latin:keyStyle="shiftKeyStyle" />
-        <include latin:keyboardLayout="@xml/rowkeys_lao4" />
-        <Key latin:keyStyle="deleteKeyStyle" />
-    </Row>
-    <include latin:keyboardLayout="@xml/row_qwerty4" />
-</merge>
diff --git a/java/res/xml/rows_malayalam.xml b/java/res/xml/rows_malayalam.xml
deleted file mode 100644
index 48148e173..000000000
--- a/java/res/xml/rows_malayalam.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2014, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <include latin:keyboardLayout="@xml/key_styles_common" />
-    <include latin:keyboardLayout="@xml/row_number_switch" />
-    <Row
-        latin:keyWidth="9.091%p"
-        latin:keyLabelFlags="fontNormal|autoXScale"
-    >
-        <include latin:keyboardLayout="@xml/rowkeys_malayalam1" />
-    </Row>
-    <Row
-        latin:keyWidth="9.091%p"
-        latin:keyLabelFlags="fontNormal|autoXScale"
-    >
-        <include latin:keyboardLayout="@xml/rowkeys_malayalam2" />
-    </Row>
-    <Row
-        latin:keyWidth="9.091%p"
-        latin:keyLabelFlags="fontNormal|autoXScale"
-    >
-        <include latin:keyboardLayout="@xml/rowkeys_malayalam3" />
-        <Key
-            latin:keyStyle="deleteKeyStyle"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <include latin:keyboardLayout="@xml/row_qwerty4" />
-</merge>
\ No newline at end of file
diff --git a/java/res/xml/rows_marathi.xml b/java/res/xml/rows_marathi.xml
deleted file mode 100644
index 103d6288d..000000000
--- a/java/res/xml/rows_marathi.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2014, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <include latin:keyboardLayout="@xml/key_styles_common" />
-    <include latin:keyboardLayout="@xml/row_number_switch" />
-    <Row
-        latin:keyWidth="9.091%p"
-        latin:keyLabelFlags="fontNormal"
-    >
-        <include latin:keyboardLayout="@xml/rowkeys_marathi1" />
-    </Row>
-    <Row
-        latin:keyWidth="9.091%p"
-        latin:keyLabelFlags="fontNormal"
-    >
-        <include latin:keyboardLayout="@xml/rowkeys_marathi2" />
-    </Row>
-    <Row
-        latin:keyWidth="9.091%p"
-        latin:keyLabelFlags="fontNormal"
-    >
-        <include latin:keyboardLayout="@xml/rowkeys_marathi3" />
-        <Key
-            latin:keyStyle="deleteKeyStyle"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <include latin:keyboardLayout="@xml/row_qwerty4" />
-</merge>
\ No newline at end of file
diff --git a/java/res/xml/rows_mongolian.xml b/java/res/xml/rows_mongolian.xml
deleted file mode 100644
index 4e0834844..000000000
--- a/java/res/xml/rows_mongolian.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <include
-        latin:keyboardLayout="@xml/key_styles_common" />
-    <include latin:keyboardLayout="@xml/row_number_switch" />
-    <Row
-        latin:keyWidth="9.091%p"
-    >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_mongolian1" />
-    </Row>
-    <Row
-            latin:keyWidth="9.091%p"
-    >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_mongolian2" />
-    </Row>
-    <Row
-        latin:keyWidth="8.711%p"
-    >
-        <Key
-            latin:keyStyle="shiftKeyStyle"
-            latin:keyWidth="10.8%p" />
-        <include
-            latin:keyboardLayout="@xml/rowkeys_mongolian3" />
-        <Key
-            latin:keyStyle="deleteKeyStyle"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <include
-        latin:keyboardLayout="@xml/row_qwerty4" />
-</merge>
diff --git a/java/res/xml/rows_nepali_romanized.xml b/java/res/xml/rows_nepali_romanized.xml
deleted file mode 100644
index fb31db4df..000000000
--- a/java/res/xml/rows_nepali_romanized.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2013, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <include latin:keyboardLayout="@xml/key_styles_common" />
-    <include latin:keyboardLayout="@xml/row_number_switch" />
-    <Row
-        latin:keyWidth="9.091%p"
-        latin:keyLabelFlags="fontNormal"
-    >
-        <include latin:keyboardLayout="@xml/rowkeys_nepali_romanized1" />
-    </Row>
-    <Row
-        latin:keyWidth="9.091%p"
-        latin:keyLabelFlags="fontNormal"
-    >
-        <include latin:keyboardLayout="@xml/rowkeys_nepali_romanized2" />
-    </Row>
-    <Row
-        latin:keyWidth="8.75%p"
-        latin:keyLabelFlags="fontNormal"
-    >
-        <Key
-            latin:keyStyle="shiftKeyStyle"
-            latin:keyWidth="15%p"
-            latin:visualInsetsRight="1%p" />
-        <include latin:keyboardLayout="@xml/rowkeys_nepali_romanized3" />
-        <Key
-            latin:keyStyle="deleteKeyStyle"
-            latin:keyWidth="fillRight"
-            latin:visualInsetsLeft="1%p" />
-    </Row>
-    <include latin:keyboardLayout="@xml/row_qwerty4" />
-</merge>
diff --git a/java/res/xml/rows_nepali_traditional.xml b/java/res/xml/rows_nepali_traditional.xml
deleted file mode 100644
index e6dd933b2..000000000
--- a/java/res/xml/rows_nepali_traditional.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2013, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <include latin:keyboardLayout="@xml/key_styles_common" />
-    <include latin:keyboardLayout="@xml/key_styles_currency" />
-    <include latin:keyboardLayout="@xml/row_number_switch" />
-    <Row
-        latin:keyWidth="9.091%p"
-        latin:keyLabelFlags="fontNormal"
-    >
-        <include latin:keyboardLayout="@xml/rowkeys_nepali_traditional1" />
-    </Row>
-    <Row
-        latin:keyWidth="9.091%p"
-        latin:keyLabelFlags="fontNormal"
-    >
-        <include latin:keyboardLayout="@xml/rowkeys_nepali_traditional2" />
-    </Row>
-    <Row
-        latin:keyWidth="8.711%p"
-        latin:keyLabelFlags="fontNormal"
-    >
-        <Key
-            latin:keyStyle="shiftKeyStyle"
-            latin:keyWidth="10.8%p" />
-        <include latin:keyboardLayout="@xml/rowkeys_nepali_traditional3" />
-        <Key
-            latin:keyStyle="deleteKeyStyle"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <include latin:keyboardLayout="@xml/row_qwerty4" />
-</merge>
diff --git a/java/res/xml/rows_nordic.xml b/java/res/xml/rows_nordic.xml
deleted file mode 100644
index 7ebf7610b..000000000
--- a/java/res/xml/rows_nordic.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2010, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <include
-        latin:keyboardLayout="@xml/key_styles_common" />
-    <include latin:keyboardLayout="@xml/row_number_switch" />
-    <Row
-        latin:keyWidth="9.091%p"
-    >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_nordic1" />
-    </Row>
-    <Row
-        latin:keyWidth="9.091%p"
-    >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_nordic2" />
-    </Row>
-    <Row
-        latin:keyWidth="9.2%p"
-    >
-        <Key
-            latin:keyStyle="shiftKeyStyle"
-            latin:keyWidth="15%p"
-            latin:visualInsetsRight="1%p" />
-        <Spacer
-            latin:keyWidth="2.8%p" />
-        <include
-            latin:keyboardLayout="@xml/rowkeys_qwerty3" />
-        <Key
-            latin:keyStyle="deleteKeyStyle"
-            latin:keyXPos="-15%p"
-            latin:keyWidth="fillRight"
-            latin:visualInsetsLeft="1%p" />
-    </Row>
-    <include
-        latin:keyboardLayout="@xml/row_qwerty4" />
-</merge>
diff --git a/java/res/xml/rows_number.xml b/java/res/xml/rows_number.xml
deleted file mode 100644
index 0312b04ab..000000000
--- a/java/res/xml/rows_number.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2008, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <include
-        latin:keyboardLayout="@xml/key_styles_common" />
-    <include
-        latin:keyboardLayout="@xml/key_styles_number" />
-    <switch>
-        <case
-            latin:passwordInput="true"
-        >
-            <include
-                latin:keyboardLayout="@xml/rows_number_password" />
-        </case>
-        <default>
-            <include
-                latin:keyboardLayout="@xml/rows_number_normal" />
-        </default>
-    </switch>
-</merge>
diff --git a/java/res/xml/rows_number_normal.xml b/java/res/xml/rows_number_normal.xml
deleted file mode 100644
index dbe77f174..000000000
--- a/java/res/xml/rows_number_normal.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <Row>
-        <Key
-            latin:keySpec="1"
-            latin:keyStyle="numKeyStyle" />
-        <Key
-            latin:keySpec="2"
-            latin:keyStyle="numKeyStyle" />
-        <Key
-            latin:keySpec="3"
-            latin:keyStyle="numKeyStyle" />
-        <Key
-            latin:keySpec="-"
-            latin:moreKeys="+"
-            latin:keyLabelFlags="hasPopupHint"
-            latin:keyStyle="numKeyStyle"
-            latin:backgroundType="functional"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <Row>
-        <Key
-            latin:keySpec="4"
-            latin:keyStyle="numKeyStyle" />
-        <Key
-            latin:keySpec="5"
-            latin:keyStyle="numKeyStyle" />
-        <Key
-            latin:keySpec="6"
-            latin:keyStyle="numKeyStyle" />
-        <switch>
-            <case
-                latin:mode="date"
-            >
-                <Key
-                    latin:keySpec="."
-                    latin:keyStyle="numKeyStyle"
-                    latin:backgroundType="functional"
-                    latin:keyWidth="fillRight" />
-            </case>
-            <case
-                latin:mode="time|datetime"
-            >
-                <Key
-                    latin:keySpec="."
-                    latin:moreKeys="!text/morekeys_am_pm"
-                    latin:keyLabelFlags="hasPopupHint"
-                    latin:keyStyle="numKeyStyle"
-                    latin:backgroundType="functional"
-                    latin:keyWidth="fillRight" />
-            </case>
-            <default>
-                <Key
-                    latin:keySpec=","
-                    latin:keyStyle="numKeyStyle"
-                    latin:backgroundType="functional"
-                    latin:keyWidth="fillRight" />
-            </default>
-        </switch>
-    </Row>
-    <Row>
-        <Key
-            latin:keySpec="7"
-            latin:keyStyle="numKeyStyle" />
-        <Key
-            latin:keySpec="8"
-            latin:keyStyle="numKeyStyle"/>
-        <Key
-            latin:keySpec="9"
-            latin:keyStyle="numKeyStyle" />
-        <Key
-            latin:keyStyle="deleteKeyStyle"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <Row>
-        <switch>
-            <case
-                latin:mode="date"
-            >
-                <Key
-                    latin:keySpec="/"
-                    latin:keyStyle="numKeyStyle" />
-            </case>
-            <case
-                latin:mode="time"
-            >
-                <Key
-                    latin:keySpec=":"
-                    latin:keyStyle="numKeyStyle" />
-            </case>
-            <case
-                latin:mode="datetime"
-            >
-                <Key
-                    latin:keySpec="/ :|/"
-                    latin:moreKeys="!noPanelAutoMoreKey!,:"
-                    latin:keyStyle="numKeyStyle" />
-            </case>
-            <default>
-                <Key
-                    latin:keySpec="."
-                    latin:keyStyle="numKeyStyle" />
-            </default>
-        </switch>
-        <Key
-            latin:keySpec="0"
-            latin:keyStyle="numKeyStyle" />
-        <Key
-            latin:keyStyle="numSpaceKeyStyle" />
-        <Key
-            latin:keyStyle="enterKeyStyle"
-            latin:keyWidth="fillRight" />
-    </Row>
-</merge>
diff --git a/java/res/xml/rows_number_password.xml b/java/res/xml/rows_number_password.xml
deleted file mode 100644
index a59b8ef78..000000000
--- a/java/res/xml/rows_number_password.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <Row>
-        <!-- Note: This Spacer prevents the below key from being marked as a left edge key. -->
-        <Spacer
-            latin:keyWidth="10%p" />
-        <Key
-            latin:keyStyle="num1KeyStyle" />
-        <Key
-            latin:keyStyle="num2KeyStyle" />
-        <Key
-            latin:keyStyle="num3KeyStyle" />
-        <!-- Note: This Spacer prevents the above key from being marked as a right edge key. -->
-        <Spacer
-            latin:keyWidth="fillRight" />
-    </Row>
-    <Row>
-        <!-- Note: This Spacer prevents the below key from being marked as a left edge key. -->
-        <Spacer
-            latin:keyWidth="10%p" />
-        <Key
-            latin:keyStyle="num4KeyStyle" />
-        <Key
-            latin:keyStyle="num5KeyStyle" />
-        <Key
-            latin:keyStyle="num6KeyStyle" />
-        <!-- Note: This Spacer prevents the above key from being marked as a right edge key. -->
-        <Spacer
-            latin:keyWidth="fillRight" />
-    </Row>
-    <Row>
-        <!-- Note: This Spacer prevents the below key from being marked as a left edge key. -->
-        <Spacer
-            latin:keyWidth="10%p" />
-        <Key
-            latin:keyStyle="num7KeyStyle" />
-        <Key
-            latin:keyStyle="num8KeyStyle" />
-        <Key
-            latin:keyStyle="num9KeyStyle" />
-        <!-- Note: This Spacer prevents the above key from being marked as a right edge key. -->
-        <Spacer
-            latin:keyWidth="fillRight" />
-    </Row>
-    <Row>
-        <!-- Note: This Spacer prevents the below key from being marked as a left edge key. -->
-        <Spacer
-            latin:keyWidth="10%p" />
-        <Key
-            latin:keyStyle="deleteKeyStyle" />
-        <Key
-            latin:keyStyle="num0KeyStyle"
-            latin:keyHintLabel="+" />
-        <Key
-            latin:keyStyle="enterKeyStyle" />
-        <!-- Note: This Spacer prevents the above key from being marked as a right edge key. -->
-        <Spacer
-            latin:keyWidth="fillRight" />
-    </Row>
-</merge>
diff --git a/java/res/xml/rows_pcqwerty.xml b/java/res/xml/rows_pcqwerty.xml
deleted file mode 100644
index 2417fc9bf..000000000
--- a/java/res/xml/rows_pcqwerty.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <include
-        latin:keyboardLayout="@xml/key_styles_common" />
-    <Row
-        latin:keyWidth="7.692%p"
-    >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_pcqwerty1" />
-    </Row>
-    <Row
-        latin:keyWidth="7.692%p"
-    >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_pcqwerty2" />
-    </Row>
-    <Row
-        latin:keyWidth="7.692%p"
-    >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_pcqwerty3"
-            latin:keyXPos="3.846%p" />
-        <Key
-            latin:keyStyle="deleteKeyStyle"
-            latin:keyWidth="fillRight"
-            latin:visualInsetsLeft="1%p" />
-    </Row>
-    <Row
-        latin:keyWidth="7.692%p"
-    >
-        <Key
-            latin:keyStyle="shiftKeyStyle"
-            latin:keyWidth="11.538%p"
-            latin:visualInsetsRight="1%p" />
-        <include
-            latin:keyboardLayout="@xml/rowkeys_pcqwerty4" />
-        <Key
-            latin:keyStyle="shiftKeyStyle"
-            latin:keyWidth="fillRight"
-            latin:visualInsetsLeft="1%p" />
-    </Row>
-    <include
-        latin:keyboardLayout="@xml/row_pcqwerty5" />
-</merge>
diff --git a/java/res/xml/rows_phone.xml b/java/res/xml/rows_phone.xml
deleted file mode 100644
index 3ac9acf9a..000000000
--- a/java/res/xml/rows_phone.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2011, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <include
-        latin:keyboardLayout="@xml/key_styles_common" />
-    <include
-        latin:keyboardLayout="@xml/key_styles_number" />
-    <Row>
-        <Key
-            latin:keyStyle="num1KeyStyle" />
-        <Key
-            latin:keyStyle="num2KeyStyle" />
-        <Key
-            latin:keyStyle="num3KeyStyle" />
-        <Key
-            latin:keySpec="-"
-            latin:moreKeys="+"
-            latin:keyLabelFlags="hasPopupHint"
-            latin:keyStyle="numKeyStyle"
-            latin:backgroundType="functional"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <Row>
-        <Key
-            latin:keyStyle="num4KeyStyle" />
-        <Key
-            latin:keyStyle="num5KeyStyle" />
-        <Key
-            latin:keyStyle="num6KeyStyle" />
-        <Key
-            latin:keySpec="."
-            latin:keyStyle="numKeyStyle"
-            latin:backgroundType="functional"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <Row>
-        <Key
-            latin:keyStyle="num7KeyStyle" />
-        <Key
-            latin:keyStyle="num8KeyStyle" />
-        <Key
-            latin:keyStyle="num9KeyStyle" />
-        <Key
-            latin:keyStyle="deleteKeyStyle"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <Row>
-        <Key
-            latin:keyStyle="numPhoneToSymbolKeyStyle" />
-        <!-- U+0030: "0" DIGIT ZERO -->
-        <Key
-            latin:keyStyle="num0KeyStyle"
-            latin:keySpec="0 +|0"
-            latin:moreKeys="!noPanelAutoMoreKey!,+" />
-        <Key
-            latin:keyStyle="numSpaceKeyStyle" />
-        <Key
-            latin:keyStyle="enterKeyStyle"
-            latin:keyWidth="fillRight" />
-    </Row>
-</merge>
diff --git a/java/res/xml/rows_phone_symbols.xml b/java/res/xml/rows_phone_symbols.xml
deleted file mode 100644
index e8ca7f0cf..000000000
--- a/java/res/xml/rows_phone_symbols.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2011, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <include
-        latin:keyboardLayout="@xml/key_styles_common" />
-    <include
-        latin:keyboardLayout="@xml/key_styles_number" />
-    <Row>
-        <Key
-            latin:keySpec="("
-            latin:keyStyle="numSymbolKeyStyle" />
-        <Key
-            latin:keySpec="/"
-            latin:keyStyle="numSymbolKeyStyle" />
-        <Key
-            latin:keySpec=")"
-            latin:keyStyle="numSymbolKeyStyle" />
-        <Key
-            latin:keySpec="-"
-            latin:moreKeys="+"
-            latin:keyLabelFlags="hasPopupHint"
-            latin:keyStyle="numKeyStyle"
-            latin:backgroundType="functional"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <Row>
-        <Key
-            latin:keySpec="N"
-            latin:keyStyle="numSymbolKeyStyle" />
-        <!-- Pause is a comma. Check PhoneNumberUtils.java to see if this
-            has changed. -->
-        <Key
-            latin:keySpec="!string/label_pause_key|,"
-            latin:keyLabelFlags="followKeyLabelRatio|autoXScale"
-            latin:keyStyle="numSymbolKeyStyle" />
-        <Key
-            latin:keySpec=","
-            latin:keyStyle="numSymbolKeyStyle" />
-        <Key
-            latin:keySpec="."
-            latin:keyStyle="numKeyStyle"
-            latin:backgroundType="functional"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <Row>
-        <!-- U+FF0A: "＊" FULLWIDTH ASTERISK -->
-        <Key
-            latin:keySpec="&#xFF0A;|*"
-            latin:keyStyle="numSymbolKeyStyle" />
-        <!-- Wait is a semicolon. -->
-        <Key
-            latin:keySpec="!string/label_wait_key|;"
-            latin:keyLabelFlags="followKeyLabelRatio|autoXScale"
-            latin:keyStyle="numSymbolKeyStyle" />
-        <Key
-            latin:keySpec="\#"
-            latin:keyStyle="numSymbolKeyStyle" />
-        <Key
-            latin:keyStyle="deleteKeyStyle"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <Row>
-        <Key
-            latin:keyStyle="numPhoneToNumericKeyStyle" />
-        <Key
-            latin:keySpec="+"
-            latin:keyStyle="numSymbolKeyStyle" />
-        <Key
-            latin:keyStyle="numSpaceKeyStyle" />
-        <Key
-            latin:keyStyle="enterKeyStyle"
-            latin:keyWidth="fillRight" />
-    </Row>
-</merge>
diff --git a/java/res/xml/rows_qwerty.xml b/java/res/xml/rows_qwerty.xml
deleted file mode 100644
index a0803df29..000000000
--- a/java/res/xml/rows_qwerty.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2010, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <include
-        latin:keyboardLayout="@xml/key_styles_common" />
-    <include latin:keyboardLayout="@xml/row_number_switch" />
-    <Row
-        latin:keyWidth="10%p"
-    >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_qwerty1" />
-    </Row>
-    <Row
-        latin:keyWidth="10%p"
-    >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_qwerty2"
-            latin:keyXPos="5%p" />
-    </Row>
-    <Row
-        latin:keyWidth="10%p"
-    >
-        <Key
-            latin:keyStyle="shiftKeyStyle"
-            latin:keyWidth="15%p"
-            latin:visualInsetsRight="1%p" />
-        <include
-            latin:keyboardLayout="@xml/rowkeys_qwerty3" />
-        <Key
-            latin:keyStyle="deleteKeyStyle"
-            latin:keyWidth="fillRight"
-            latin:visualInsetsLeft="1%p" />
-    </Row>
-    <include
-        latin:keyboardLayout="@xml/row_qwerty4" />
-</merge>
diff --git a/java/res/xml/rows_qwertz.xml b/java/res/xml/rows_qwertz.xml
deleted file mode 100644
index 2f4b3375c..000000000
--- a/java/res/xml/rows_qwertz.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2010, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <include
-        latin:keyboardLayout="@xml/key_styles_common" />
-    <include latin:keyboardLayout="@xml/row_number_switch" />
-    <Row
-        latin:keyWidth="10%p"
-    >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_qwertz1" />
-    </Row>
-    <Row
-        latin:keyWidth="10%p"
-    >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_qwerty2"
-            latin:keyXPos="5%p" />
-    </Row>
-    <Row
-        latin:keyWidth="10%p"
-    >
-        <Key
-            latin:keyStyle="shiftKeyStyle"
-            latin:keyWidth="15%p"
-            latin:visualInsetsRight="1%p" />
-        <include
-            latin:keyboardLayout="@xml/rowkeys_qwertz3" />
-        <Key
-            latin:keyStyle="deleteKeyStyle"
-            latin:keyWidth="fillRight"
-            latin:visualInsetsLeft="1%p" />
-    </Row>
-   <include
-        latin:keyboardLayout="@xml/row_qwerty4" />
-</merge>
diff --git a/java/res/xml/rows_serbian_qwertz.xml b/java/res/xml/rows_serbian_qwertz.xml
deleted file mode 100644
index 5e6fdc34a..000000000
--- a/java/res/xml/rows_serbian_qwertz.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2014, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto" >
-    <include latin:keyboardLayout="@xml/key_styles_common" />
-    <include latin:keyboardLayout="@xml/row_number_switch" />
-    <Row latin:keyWidth="9.091%p" >
-        <include latin:keyboardLayout="@xml/rowkeys_serbian_qwertz1" />
-    </Row>
-    <Row latin:keyWidth="9.091%p" >
-        <include latin:keyboardLayout="@xml/rowkeys_serbian_qwertz2" />
-    </Row>
-    <Row latin:keyWidth="8.711%p" >
-        <Key
-            latin:keyStyle="shiftKeyStyle"
-            latin:keyWidth="10.8%p" />
-        <include latin:keyboardLayout="@xml/rowkeys_serbian_qwertz3" />
-        <Key
-            latin:keyStyle="deleteKeyStyle"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <include latin:keyboardLayout="@xml/row_qwerty4" />
-</merge>
\ No newline at end of file
diff --git a/java/res/xml/rows_sinhala.xml b/java/res/xml/rows_sinhala.xml
deleted file mode 100644
index ef7d333c5..000000000
--- a/java/res/xml/rows_sinhala.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2014, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <include latin:keyboardLayout="@xml/key_styles_common" />
-    <include latin:keyboardLayout="@xml/row_number_switch" />
-    <Row
-        latin:keyWidth="9.091%p"
-        latin:keyLabelFlags="fontNormal|autoXScale"
-    >
-        <include latin:keyboardLayout="@xml/rowkeys_sinhala1" />
-    </Row>
-    <Row
-        latin:keyWidth="9.091%p"
-        latin:keyLabelFlags="fontNormal|autoXScale"
-    >
-        <include latin:keyboardLayout="@xml/rowkeys_sinhala2" />
-    </Row>
-    <Row
-        latin:keyWidth="8.711%p"
-        latin:keyLabelFlags="fontNormal|autoXScale"
-    >
-        <Key
-            latin:keyStyle="shiftKeyStyle"
-            latin:keyWidth="10.8%p" />
-        <include latin:keyboardLayout="@xml/rowkeys_sinhala3" />
-        <Key
-            latin:keyStyle="deleteKeyStyle"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <include latin:keyboardLayout="@xml/row_qwerty4" />
-</merge>
diff --git a/java/res/xml/rows_south_slavic.xml b/java/res/xml/rows_south_slavic.xml
deleted file mode 100644
index c78ee1bf2..000000000
--- a/java/res/xml/rows_south_slavic.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2011, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <include
-        latin:keyboardLayout="@xml/key_styles_common" />
-    <include latin:keyboardLayout="@xml/row_number_switch" />
-    <Row
-        latin:keyWidth="9.091%p"
-    >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_south_slavic1" />
-    </Row>
-    <Row
-        latin:keyWidth="9.091%p"
-    >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_south_slavic2" />
-    </Row>
-    <Row
-        latin:keyWidth="8.711%p"
-    >
-        <Key
-            latin:keyStyle="shiftKeyStyle"
-            latin:keyWidth="10.8%p" />
-        <include
-            latin:keyboardLayout="@xml/rowkeys_south_slavic3" />
-        <Key
-            latin:keyStyle="deleteKeyStyle"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <include
-        latin:keyboardLayout="@xml/row_qwerty4" />
-</merge>
diff --git a/java/res/xml/rows_spanish.xml b/java/res/xml/rows_spanish.xml
deleted file mode 100644
index 7363f55bd..000000000
--- a/java/res/xml/rows_spanish.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2011, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <include
-        latin:keyboardLayout="@xml/key_styles_common" />
-    <include latin:keyboardLayout="@xml/row_number_switch" />
-    <Row
-        latin:keyWidth="10%p"
-    >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_qwerty1" />
-    </Row>
-    <Row
-        latin:keyWidth="10%p"
-    >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_spanish2" />
-    </Row>
-    <Row
-        latin:keyWidth="10%p"
-    >
-        <Key
-            latin:keyStyle="shiftKeyStyle"
-            latin:keyWidth="15%p"
-            latin:visualInsetsRight="1%p" />
-        <include
-            latin:keyboardLayout="@xml/rowkeys_qwerty3" />
-        <Key
-            latin:keyStyle="deleteKeyStyle"
-            latin:keyWidth="fillRight"
-            latin:visualInsetsLeft="1%p" />
-    </Row>
-    <include
-        latin:keyboardLayout="@xml/row_qwerty4" />
-</merge>
diff --git a/java/res/xml/rows_swiss.xml b/java/res/xml/rows_swiss.xml
deleted file mode 100644
index 8ca135ed2..000000000
--- a/java/res/xml/rows_swiss.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2013, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <include
-        latin:keyboardLayout="@xml/key_styles_common" />
-    <include latin:keyboardLayout="@xml/row_number_switch" />
-    <Row
-        latin:keyWidth="9.091%p"
-    >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_swiss1" />
-    </Row>
-    <Row
-        latin:keyWidth="9.091%p"
-    >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_swiss2" />
-    </Row>
-    <Row
-        latin:keyWidth="9.2%p"
-    >
-        <Key
-            latin:keyStyle="shiftKeyStyle"
-            latin:keyWidth="15%p"
-            latin:visualInsetsRight="1%p" />
-        <Spacer
-            latin:keyWidth="2.8%p" />
-        <include
-            latin:keyboardLayout="@xml/rowkeys_qwertz3" />
-        <Key
-            latin:keyStyle="deleteKeyStyle"
-            latin:keyXPos="-15%p"
-            latin:keyWidth="fillRight"
-            latin:visualInsetsLeft="1%p" />
-    </Row>
-    <include
-        latin:keyboardLayout="@xml/row_qwerty4" />
-</merge>
diff --git a/java/res/xml/rows_symbols.xml b/java/res/xml/rows_symbols.xml
deleted file mode 100644
index eddee361e..000000000
--- a/java/res/xml/rows_symbols.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2011, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <include
-        latin:keyboardLayout="@xml/key_styles_common" />
-    <include
-        latin:keyboardLayout="@xml/key_styles_currency" />
-    <Row
-        latin:keyWidth="10%p"
-    >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_symbols1" />
-    </Row>
-    <switch>
-        <case latin:numberRow="true">
-            <Row>
-                <Key
-                    latin:keySpec="!text/keyspec_symbols_percent"
-                    latin:moreKeys="!text/morekeys_symbols_percent" />
-                <Key
-                    latin:keySpec="\\\\" />
-                <Key
-                    latin:keySpec="\|" />
-                <Key
-                    latin:keySpec="=" />
-                <Key
-                    latin:keySpec="[" />
-                <Key
-                    latin:keySpec="]" />
-                <Key
-                    latin:keySpec="&#x003C;" />
-                <Key
-                    latin:keySpec="&#x003E;" />
-                <Key
-                    latin:keySpec="{" />
-                <Key
-                    latin:keySpec="}" />
-            </Row>
-        </case>
-        <default> </default>
-    </switch>
-    <Row
-        latin:keyWidth="10%p"
-    >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_symbols2"
-            latin:keyXPos="5%p" />
-    </Row>
-    <Row
-        latin:keyWidth="10%p"
-    >
-        <Key
-            latin:keyStyle="toMoreSymbolKeyStyle"
-            latin:keyWidth="15%p"
-            latin:visualInsetsRight="1%p" />
-        <include
-            latin:keyboardLayout="@xml/rowkeys_symbols3" />
-        <Key
-            latin:keyStyle="deleteKeyStyle"
-            latin:keyWidth="fillRight"
-            latin:visualInsetsLeft="1%p" />
-    </Row>
-    <Row
-        latin:keyWidth="10%p"
-        latin:backgroundType="functional"
-    >
-        <Key
-            latin:keyStyle="toAlphaKeyStyle"
-            latin:keyWidth="15%p" />
-        <include
-            latin:keyboardLayout="@xml/row_symbols4" />
-        <Key
-            latin:keyStyle="enterKeyStyle"
-            latin:keyWidth="fillRight" />
-    </Row>
-</merge>
diff --git a/java/res/xml/rows_symbols_shift.xml b/java/res/xml/rows_symbols_shift.xml
deleted file mode 100644
index b7fb338bd..000000000
--- a/java/res/xml/rows_symbols_shift.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2008, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <include
-        latin:keyboardLayout="@xml/key_styles_common" />
-    <include
-        latin:keyboardLayout="@xml/key_styles_currency" />
-    <switch>
-        <case latin:numberRow="true"> <Row /> </case>
-        <default> </default>
-    </switch>
-    <Row
-        latin:keyWidth="10%p"
-    >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_symbols_shift1" />
-    </Row>
-    <Row
-        latin:keyWidth="10%p"
-    >
-        <include
-            latin:keyXPos="5%p"
-            latin:keyboardLayout="@xml/rowkeys_symbols_shift2" />
-    </Row>
-    <Row
-        latin:keyWidth="10%p"
-    >
-        <Key
-            latin:keyStyle="backFromMoreSymbolKeyStyle"
-            latin:keyWidth="15%p"
-            latin:visualInsetsRight="1%p" />
-        <include
-            latin:keyboardLayout="@xml/rowkeys_symbols_shift3" />
-        <Key
-            latin:keyStyle="deleteKeyStyle"
-            latin:keyWidth="fillRight"
-            latin:visualInsetsLeft="1%p" />
-    </Row>
-    <Row
-        latin:keyWidth="10%p"
-        latin:backgroundType="functional"
-    >
-        <Key
-            latin:keyStyle="toAlphaKeyStyle"
-            latin:keyWidth="15%p" />
-        <include
-            latin:keyboardLayout="@xml/row_symbols_shift4" />
-        <Key
-            latin:keyStyle="enterKeyStyle"
-            latin:keyWidth="fillRight" />
-    </Row>
-</merge>
diff --git a/java/res/xml/rows_tamil.xml b/java/res/xml/rows_tamil.xml
deleted file mode 100644
index 6afa283ae..000000000
--- a/java/res/xml/rows_tamil.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2014, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <include latin:keyboardLayout="@xml/key_styles_common" />
-    <include latin:keyboardLayout="@xml/row_number_switch" />
-    <Row
-        latin:keyWidth="9.091%p"
-        latin:keyLabelFlags="fontNormal|autoXScale"
-    >
-        <include latin:keyboardLayout="@xml/rowkeys_tamil1" />
-    </Row>
-    <Row
-        latin:keyWidth="9.091%p"
-        latin:keyLabelFlags="fontNormal|autoXScale"
-    >
-        <include latin:keyboardLayout="@xml/rowkeys_tamil2" />
-    </Row>
-    <Row
-        latin:keyWidth="9.091%p"
-        latin:keyLabelFlags="fontNormal|autoXScale"
-    >
-        <include latin:keyboardLayout="@xml/rowkeys_tamil3" />
-        <Key
-            latin:keyStyle="deleteKeyStyle"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <include latin:keyboardLayout="@xml/row_qwerty4" />
-</merge>
\ No newline at end of file
diff --git a/java/res/xml/rows_telugu.xml b/java/res/xml/rows_telugu.xml
deleted file mode 100644
index 0b8e29675..000000000
--- a/java/res/xml/rows_telugu.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2014, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <include latin:keyboardLayout="@xml/key_styles_common" />
-    <include latin:keyboardLayout="@xml/row_number_switch" />
-    <Row
-        latin:keyWidth="9.091%p"
-        latin:keyLabelFlags="fontNormal|autoXScale"
-    >
-        <include latin:keyboardLayout="@xml/rowkeys_telugu1" />
-    </Row>
-    <Row
-        latin:keyWidth="9.091%p"
-        latin:keyLabelFlags="fontNormal|autoXScale"
-    >
-        <include latin:keyboardLayout="@xml/rowkeys_telugu2" />
-    </Row>
-    <Row
-        latin:keyWidth="9.091%p"
-        latin:keyLabelFlags="fontNormal|autoXScale"
-    >
-        <include latin:keyboardLayout="@xml/rowkeys_telugu3" />
-        <Key
-            latin:keyStyle="deleteKeyStyle"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <include latin:keyboardLayout="@xml/row_qwerty4" />
-</merge>
\ No newline at end of file
diff --git a/java/res/xml/rows_thai.xml b/java/res/xml/rows_thai.xml
deleted file mode 100644
index 0f49147c1..000000000
--- a/java/res/xml/rows_thai.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <include latin:keyboardLayout="@xml/key_styles_common" />
-    <include latin:keyboardLayout="@xml/row_number_switch" />
-    <Row
-        latin:keyWidth="8.3333%p"
-        latin:keyLabelFlags="fontNormal"
-    >
-        <include latin:keyboardLayout="@xml/rowkeys_thai1" />
-    </Row>
-    <Row
-        latin:keyWidth="8.3333%p"
-        latin:keyLabelFlags="fontNormal"
-    >
-        <include latin:keyboardLayout="@xml/rowkeys_thai2" />
-    </Row>
-    <Row
-        latin:keyWidth="8.3333%p"
-        latin:keyLabelFlags="fontNormal"
-    >
-        <include latin:keyboardLayout="@xml/rowkeys_thai3" />
-        <include latin:keyboardLayout="@xml/key_thai_kho_khuat" />
-    </Row>
-    <Row
-        latin:keyWidth="8.3333%p"
-        latin:keyLabelFlags="fontNormal"
-    >
-        <Key latin:keyStyle="shiftKeyStyle" />
-        <include latin:keyboardLayout="@xml/rowkeys_thai4" />
-        <Key latin:keyStyle="deleteKeyStyle" />
-    </Row>
-    <include latin:keyboardLayout="@xml/row_qwerty4" />
-</merge>
diff --git a/java/res/xml/rows_turkish.xml b/java/res/xml/rows_turkish.xml
deleted file mode 100644
index c76bd3050..000000000
--- a/java/res/xml/rows_turkish.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2011, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <include
-        latin:keyboardLayout="@xml/key_styles_common" />
-    <include latin:keyboardLayout="@xml/row_number_switch" />
-    <Row
-        latin:keyWidth="8.333%p"
-    >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_turkish1" />
-    </Row>
-    <Row
-        latin:keyWidth="8.333%p"
-    >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_turkish2"
-            latin:keyXPos="4.167%p" />
-    </Row>
-    <Row
-        latin:keyWidth="8.333%p"
-    >
-        <Key
-            latin:keyStyle="shiftKeyStyle"
-            latin:keyWidth="12.5%p"
-            latin:visualInsetsRight="1%p" />
-        <include
-            latin:keyboardLayout="@xml/rowkeys_turkish3" />
-        <Key
-            latin:keyStyle="deleteKeyStyle"
-            latin:keyWidth="fillRight"
-            latin:visualInsetsLeft="1%p" />
-    </Row>
-    <include
-        latin:keyboardLayout="@xml/row_qwerty4" />
-</merge>
diff --git a/java/res/xml/rows_uzbek.xml b/java/res/xml/rows_uzbek.xml
deleted file mode 100644
index d1fd17612..000000000
--- a/java/res/xml/rows_uzbek.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2014, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto" >
-    <include latin:keyboardLayout="@xml/key_styles_common" />
-    <include latin:keyboardLayout="@xml/row_number_switch" />
-    <Row latin:keyWidth="9.091%p" >
-        <include latin:keyboardLayout="@xml/rowkeys_uzbek1" />
-    </Row>
-    <Row latin:keyWidth="9.091%p" >
-        <include latin:keyboardLayout="@xml/rowkeys_uzbek2" />
-    </Row>
-    <Row latin:keyWidth="9.2%p" >
-        <Key
-            latin:keyStyle="shiftKeyStyle"
-            latin:keyWidth="15%p"
-            latin:visualInsetsRight="1%p" />
-        <Spacer latin:keyWidth="2.8%p" />
-        <include latin:keyboardLayout="@xml/rowkeys_qwerty3" />
-        <Key
-            latin:keyStyle="deleteKeyStyle"
-            latin:keyWidth="fillRight"
-            latin:keyXPos="-15%p"
-            latin:visualInsetsLeft="1%p" />
-    </Row>
-    <include latin:keyboardLayout="@xml/row_qwerty4" />
-</merge>
\ No newline at end of file