huashan: use msm8x60 kernel and msm8960_common

    update carbon to use changed repos from CyanogenMod; namely
    msm8x60 and msm8960-common repos