am 8e95b2f5: Merge "Fix a bug for counting code points in WordComposer.java"

* commit '8e95b2f5a7ecedc2f1ee7ba71ed10f3df17e2ece':
  Fix a bug for counting code points in WordComposer.java