Refactor build for grouper.

Change-Id: I52c16e1f050279431528e43c73627e73abf95462
2 files changed