Back to upstream qcom/audio