Partially revert I76c3e917. Bug: 6561272 Change-Id: I5649a8ecb44bd11c67785ea97ddbb67b0a019ccc
Bug: 6371604 Change-Id: I1054685b9985b6923e3176679b3d95424d8114e0
* Rename makelabel tool to maketext * Rename KeyboardLablesSet class to KeyboardTextsSet * Rename "!label/name" to "!text/name" Change-Id: Ia9494a89fe56f20ca8e8fedb253adbcf8b771bd3