media-legacy: Use TARGET_QCOM_DISPLAY_VARIANT for inclusion.

Change-Id: Ic4356a4bd7fc10bb1dfae4b2e48ba508479ed12f
Merge remote-tracking branch 'upstream/jellybean' into cm-10.1

Conflicts:
	Android.mk