Merge branch 'cm-11.0' into kk_mkt
Merge branch 'kk_mkt' of https://github.com/k2wl/android_device_samsung_serranodsdd into kk_mkt