move to qcom/common