Merge https://github.com/CyanogenMod/android_packages_apps_Contacts into jb-mr1