Only build when variant is not requested

Change-Id: If88fc286dd48525d9aaca6a39ae753ff8cbd6783