track local hammerhead vendor
Merge branch 'kk-devel' into kk-devel-qcom
Bring in a few more CyanogenMod remotes:

packages/providers/ContactsProvider
packages/providers/TelephonyProvider
packages/providers/MediaProvider
packages/services/Telephony

That should just about wrap up the cm/qcom/caf integration, hopefully