Fix up qcom caf makes (credit AOKP)