Revert "Track CM's qcom/media"

This reverts commit 3c71de1b172bb29fc3586ac839258edf3833cf95.