am 94bc0d49: am 6e5c2db5: Merge "Cleanups in LatinIME native source code" into jb-mr1-dev

* commit '94bc0d49f82f9d3c62fe04519da55fd963db93ef':
  Cleanups in LatinIME native source code