Build fix and sync with munjeni
Merge branch 'cm-11.0' of ssh://github.com/95A31/android_device_sony_kumquat into cm-11.0