Fix media variant handling

Max copypastaed the audio stuff to media/display

Change-Id: I3fae7bd9792eaca05e4c569866a4db01002fa237