mv - aggregator constants to aggregator module.

Change-Id: Iee17c76d00fb6e83cbbcfe2081eb986a06e35f1f
mod - change refs to aggregator constants in metrics.

Change-Id: I727f6e0210f92c5a221b25278fc1072884d1d348