Merge pull request #1660 from dart-lang/merge-term_glyph-package

Merge `package:term_glyph`