Merge branch 'cm-10.1' of https://github.com/CyanogenMod/android_device_htc_msm8960-common into jb-4.2