Follow CM hardware/qcom/media

Did not fix vs980 build errors