Merge branch 'cm-10.2' of https://github.com/CyanogenMod/android_device_asus_grouper into jb3

Conflicts:
	BoardConfig.mk
	BoardConfigCommon.mk
	CleanSpec.mk
	cm.mk
	device-common.mk
	factory-images/generate-factory-images-package.sh
	fstab.grouper
	full_grouper.mk
	init.grouper.rc
	self-extractors/generate-packages.sh
	self-extractors/nxp/LICENSE
	self-extractors/trusted_logic/staging/device-partial.mk