Merge "Cleanup android.text.TextUtils a little."