Compat with new variadic templates version of boost::variant

Change-Id: If995cc1ac67a1eddcf63d1da355e1c48854d76ba