Remove every implicit use of textlib

follows:
* Iabede1697aa1f5c8e3039b2b404029bc6cfd55ff
* I6cc16f23fe9fbb851b26725557525619c3051a26

Change-Id: I0437028a32da219205fc30aec3921474132e1cc8
Merge "Remove every implicit use of textlib"