Guice-util: Use multibinder to bind component sets
Guice-util: delete dead code, fix warnings