Switch to CM's qcom-common