Revert to Evervolv qcom_media