media: Avoid collision with FFMPEG plugin

Change-Id: Ica2cdf9f6572ec18f396d25758cbb2be1359ac0b
use QCOM_DISPLAY_FOLDER to fetch display headers

Change-Id: Ieb3dbd60798a9e3d1f343eefd0d1d4976dcca44b
auto-merger: merge in from github/kk4.4