Merge "Revert "Move Language normalization code from Paint.cpp to Minikin.""