Don't look just at DESKTOP or not when deciding whether to compile that stuff.

Change-Id: Ic9961ba27eb4a1e9360c67dd844c9243f1eff00e