Revert local copy of qcom/display-caf as all commits are merged now

Change-Id: I99e580a09f4cad9c33574b0a305b837f8734816a
Merge "Revert local copy of qcom/display-caf as all commits are merged now" into cm-10.2
Remove TARGET_HAS_OLD_QCOM_ION

Change-Id: Ie0945e4c3eed521777fbd87e1c1663bdf05df0b0
Add TARGET_DISPLAY_INSECURE_MM_HEAP

Change-Id: I2119713fb142f2975b352f41884460c5c6dcb5b5
Add NEW_ION_API flag

Change-Id: I37f66fd99eb634c922b04427395d369512b76578
Merge branch 'cm-10.2' of https://github.com/CyanogenMod/android_device_motorola_msm8960-common into jb-mr2

Conflicts:
	BoardConfigCommon.mk