Don't build when variant is requested.

Change-Id: I32adc414e5e68af6c409115583984a09d65b6587

Conflicts:
	Android.mk
display: Allow build for all QCOM platforms

Change-Id: I82b62206ad3d827e1af68041f88f86f18dc19b90