Fix up qcom caf makes (credit CM)