add grouper

Conflicts:
	products/AndroidProducts.mk
add grouper

Conflicts:
	products/AndroidProducts.mk
grouper-userdebug
Merge branch 'jb-ras-mr2.0' into jb-mr2x

Conflicts:
	vendorsetup.sh
Merge branch 'jb-mr2x' into jb-mr2wip

Conflicts:
	vendorsetup.sh