Merge "Switch TextUtils over to new ICU API." into lmp-dev