We don't need to fork sony qcom common