Merge branch 'cm-10.1' of https://github.com/razrqcom-dev-team/android_device_motorola_xt926 into HEAD

Conflicts:
	full_xt926.mk
	vendorsetup.sh
Merge branch 'jb-mr1' of https://github.com/pcarenza/android_device_motorola_xt926 into HEAD

Conflicts:
	full_xt926.mk