add qcom-caf varients to dependencies  -  cleaned up device.mk - no need to inherit props twice

Change-Id: Iefd0a23c718ce5cfa2156153121a09d937bc6fba