Merge "Override TextServicesManager in layoutlib"