Updated imports to match latest versions of Trove (>= 3.0).

Please note this won't work with earlier versions of Trove (<3.0), where the classes were lumped together in the gnu.trove package.