NXP-15409 cleanup guice classpath
NXP-15409 cleanup mockito classpath