Merge "Change StringTokenizer to TextUtils.StringSplitter"