add grouper

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

Conflicts:
	vendorsetup.sh