media: Only build when no variant is set

Change-Id: I4363e0c9163050932a52711d080b0957e1d5925c
Only build when no media variant is set, and display variant isn't legacy

* Fixes change I4363e0c9163050932a52711d080b0957e1d5925c

Change-Id: Id7e5f5f5019fec5cce169d7ff5fe7d3c707562eb
Merge branch 'cm-10.1' of git://github.com/CyanogenMod/android_hardware_qcom_media into cm-10.1

Conflicts:
	Android.mk

Change-Id: Idb6cf617c6dc677bfc598beaa10f68270959d6ce