media: Only build when no variant is set

Change-Id: I4363e0c9163050932a52711d080b0957e1d5925c
Merge remote-tracking branch 'cm/cm-10.1' into cm-10.1