media-caf: Add MEDIA_VARIANT build barrier

Change-Id: I199bdd867218079d6e3b3e5ae1453e1b74e92257
Media: Update include paths for -caf

Change-Id: I43ed2669c5046dc31c0a04faaaae27bf80fb09b9
Update include logic

Change-Id: I4835d3bcc0f337bb6fd8028a5147860c6f28f5e8
mm-video: Fix compile error on 7x30.

Change-Id: Ia5d25165602eb2ae42ea8ac33248c627b07fed1d
Merge branch 'kk4.4' of https://github.com/SlimRoms/hardware_qcom_media-caf into kitkat

Conflicts:
	Android.mk
	dashplayer/Android.mk