Refactor grouper build.

Change-Id: Ibdf67c5dc4aa839171e2a36981d7d01acfa4ebfa
2 files changed