Re-sync to CM (Single commit for easy revert if needed)
Merge branch 'kitkat' of github.com:AOKP/device_samsung_qcom-common into HEAD