Fix for Viper4android
Merge branch 'cm-11.0' of git://github.com/faleandroid/android_vendor_cm into cm-11.0

Conflicts:
	config/common.mk
Fix