merged include-caf with include to fix missing file errors
added cm.mk idk why it was missing
Merge branch 'master' of https://github.com/Dm47021/android_device_lge_f6mt

x
Merge branch 'cm-11.0' of https://github.com/Dm47021/android_device_lge_f6mt

Conflicts:
	include/linux/msm_adsp.h
	include/linux/msm_vidc_dec.h
	include/linux/msm_vidc_enc.h