Follow Vanir hardware/qcom/meida

Hopefully fix building vs980 errors