Move fontNormal flag from Key to Row

Change-Id: I250da7c82e005ffe2027c528a1df731a1a3cdf47
diff --git a/java/res/xml/rowkeys_bengali1.xml b/java/res/xml/rowkeys_bengali1.xml
index c137d12..c1fd8b4 100644
--- a/java/res/xml/rowkeys_bengali1.xml
+++ b/java/res/xml/rowkeys_bengali1.xml
@@ -18,44 +18,37 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <!-- U+0994: "ঔ" BENGALI LETTER AU
          U+09E7: "১" BENGALI DIGIT ONE -->
     <Key
         latin:keySpec="&#x0994;"
         latin:keyHintLabel="&#x09E7;"
-        latin:additionalMoreKeys="&#x09E7;,1"
-        latin:keyLabelFlags="fontNormal" />
+        latin:additionalMoreKeys="&#x09E7;,1" />
     <!-- U+0990: "ঐ" BENGALI LETTER AI
          U+09E8: "২" BENGALI DIGIT TWO -->
     <Key
         latin:keySpec="&#x0990;"
         latin:keyHintLabel="&#x09E8;"
-        latin:additionalMoreKeys="&#x09E8;,2"
-        latin:keyLabelFlags="fontNormal" />
+        latin:additionalMoreKeys="&#x09E8;,2" />
     <!-- U+0986: "আ" BENGALI LETTER AA
          U+09E9: "৩" BENGALI DIGIT THREE -->
     <Key
         latin:keySpec="&#x0986;"
         latin:keyHintLabel="&#x09E9;"
-        latin:additionalMoreKeys="&#x09E9;,3"
-        latin:keyLabelFlags="fontNormal" />
+        latin:additionalMoreKeys="&#x09E9;,3" />
     <!-- U+0988: "ঈ" BENGALI LETTER II
          U+09EA: "৪" BENGALI DIGIT FOUR -->
     <Key
         latin:keySpec="&#x0988;"
         latin:keyHintLabel="&#x09EA;"
-        latin:additionalMoreKeys="&#x09EA;,4"
-        latin:keyLabelFlags="fontNormal" />
+        latin:additionalMoreKeys="&#x09EA;,4" />
     <!-- U+098A: "ঊ" BENGALI LETTER UU
          U+09EB: "৫" BENGALI DIGIT FIVE -->
     <Key
         latin:keySpec="&#x098A;"
         latin:keyHintLabel="&#x09EB;"
-        latin:additionalMoreKeys="&#x09EB;,5"
-        latin:keyLabelFlags="fontNormal" />
+        latin:additionalMoreKeys="&#x09EB;,5" />
     <!-- U+09AC: "ব" BENGALI LETTER BA
          U+09AD: "ভ" BENGALI LETTER BHA
          U+09EC: "৬" BENGALI DIGIT SIX -->
@@ -63,15 +56,13 @@
         latin:keySpec="&#x09AC;"
         latin:moreKeys="&#x09AD;,%"
         latin:keyHintLabel="&#x09EC;"
-        latin:additionalMoreKeys="&#x09EC;,6"
-        latin:keyLabelFlags="fontNormal" />
+        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"
-        latin:keyLabelFlags="fontNormal" />
+        latin:additionalMoreKeys="&#x09ED;,7" />
     <!-- U+0997: "গ" BENGALI LETTER GA
          U+0998: "ঘ" BENGALI LETTER GHA
          U+09EE: "৮" BENGALI DIGIT EIGHT -->
@@ -79,8 +70,7 @@
         latin:keySpec="&#x0997;"
         latin:moreKeys="&#x0998;,%"
         latin:keyHintLabel="&#x09EE;"
-        latin:additionalMoreKeys="&#x09EE;,8"
-        latin:keyLabelFlags="fontNormal" />
+        latin:additionalMoreKeys="&#x09EE;,8" />
     <!-- U+09A6: "দ" BENGALI LETTER DA
          U+09A7: "ধ" BENGALI LETTER DHA
          U+09EF: "৯" BENGALI DIGIT NINE -->
@@ -88,8 +78,7 @@
         latin:keySpec="&#x09A6;"
         latin:moreKeys="&#x09A7;,%"
         latin:keyHintLabel="&#x09EF;"
-        latin:additionalMoreKeys="&#x09EF;,9"
-        latin:keyLabelFlags="fontNormal" />
+        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
@@ -98,12 +87,10 @@
         latin:keySpec="&#x099C;"
         latin:moreKeys="&#x099D;,&#x099C;&#x09CD;&#x099E;,%"
         latin:keyHintLabel="&#x09E6;"
-        latin:additionalMoreKeys="&#x09E6;,0"
-        latin:keyLabelFlags="fontNormal" />
+        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;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:moreKeys="&#x09A1;&#x09BC;" />
 </merge>