Try harder to bypass avmedia on non-desktop for now

Change-Id: I8a45f7436383cb904d375d0f0d86416f3ce56567