media-caf: update includes to point to correct location
media-caf: Add TARGET_QCOM_MEDIA_VARIANT filtering

Only build if it's set to caf

Change-Id: Ia4fa6130bcb0653a88584b9dff7aef33716a01e0
Fix handling of display vs. display-caf

Originally written by Steve Kondik at
https://github.com/CyanogenMod/android_hardware_qcom_media-caf/commit/5234181ec526471bdacadd876cc202b65c53035b

Reworked to only handle deltas between display and display-caf

Change-Id: Ia47e55f46e07266d18854f29bae7aec4903288d6
media-caf: fix 7x27a support

Conflicts:

	Android.mk

Change-Id: I4c09352698ca432ed69832f3932552f48ef1616a
Merge "Merge "Remove AOSP reference to utils.mk""
Merge "Merge "Merge "Remove AOSP reference to utils.mk"""
Merge "Merge "Remove AOSP reference to utils.mk""
Merge "Merge "Merge "Remove AOSP reference to utils.mk"""
Merge "Merge "Remove AOSP reference to utils.mk""
Merge "Merge "Merge "Remove AOSP reference to utils.mk"""
Merge "Merge "Remove AOSP reference to utils.mk""
Merge "Merge "Merge "Remove AOSP reference to utils.mk"""
Merge "Merge "Remove AOSP reference to utils.mk""
Merge "Merge "Merge "Remove AOSP reference to utils.mk"""
Merge "Merge "Remove AOSP reference to utils.mk""
Merge "Merge "Merge "Remove AOSP reference to utils.mk"""
Merge "Merge "Remove AOSP reference to utils.mk""
Merge "Merge "Merge "Remove AOSP reference to utils.mk"""
Merge "Merge "Remove AOSP reference to utils.mk""
Merge "Merge "Merge "Remove AOSP reference to utils.mk"""