Add a group for blockly and re-add the aggregate group

Change-Id: Ie03458df9ffb403ffb18ad745b87ef8a50d4557b