cm-12.0: Use cm-12.0 qcom/common (finally)