Add another variant, fix another
Merge branch 'cm-11.0' of http://github.com/garwynn/android_device_samsung_klte into cm-11.0
Merge remote-tracking branch 'garwynn/cm-11.0' into HEAD