am bb3d107a: Refactor grouper build.

* commit 'bb3d107afcde51c5707894c9a35eda9c76af49af':
  Refactor grouper build.