try to keep Class-Path lenght under control

Change-Id: I5cc6f325eff9f5177e77de661728621383fa5558