add maguro&grouper support

Change-Id: I370d3a5a19d07bd462d1a216b050c1c1c680162b