Merge "Make Paint.hasGlyph variation selector aware."