Forward port r68792 and r68789 putting Counter in __all__ and adding Counter buildouts.
3 files changed