Now we have a common function for standard aggregation, so let's use it,
instead of duplicating the code.
Reviewed-by: NBrian Masney <masneyb@onstation.org>
Reviewed-by: NBjorn Andersson <bjorn.andersson@linaro.org>
Reviewed-by: NEvan Green <evgreen@chromium.org>
Signed-off-by: NGeorgi Djakov <georgi.djakov@linaro.org>