am 416362e6: Merge "Change StringTokenizer to TextUtils.StringSplitter"

* commit '416362e6d8c8d0a34e09704138688f75aa810c9b':
  Change StringTokenizer to TextUtils.StringSplitter