Move fontNormal flag from Key to Row

Change-Id: I250da7c82e005ffe2027c528a1df731a1a3cdf47
diff --git a/java/res/xml/rows_khmer.xml b/java/res/xml/rows_khmer.xml
index e399387..69334f3 100644
--- a/java/res/xml/rows_khmer.xml
+++ b/java/res/xml/rows_khmer.xml
@@ -18,39 +18,33 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
-    <include
-        latin:keyboardLayout="@xml/key_styles_common" />
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+    <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyWidth="8.3333%p"
+        latin:keyLabelFlags="fontNormal|autoXScale"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_khmer1" />
+        <include latin:keyboardLayout="@xml/rowkeys_khmer1" />
     </Row>
     <Row
         latin:keyWidth="8.3333%p"
+        latin:keyLabelFlags="fontNormal|autoXScale"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_khmer2" />
+        <include latin:keyboardLayout="@xml/rowkeys_khmer2" />
     </Row>
     <Row
         latin:keyWidth="8.3333%p"
+        latin:keyLabelFlags="fontNormal|autoXScale"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_khmer3" />
+        <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" />
+        <Key latin:keyStyle="shiftKeyStyle" />
+        <include latin:keyboardLayout="@xml/rowkeys_khmer4" />
+        <Key latin:keyStyle="deleteKeyStyle" />
     </Row>
-    <include
-        latin:keyboardLayout="@xml/row_qwerty4" />
+    <include latin:keyboardLayout="@xml/row_qwerty4" />
 </merge>