FIX DAMN COMPILE ERRORS
Merge branch 'cm-11.0' of https://github.com/MerkMod/android_device_samsung_jactivelte into cm-11.0

Conflicts:
	vendorsetup.sh