Remove conflit between google-collections and guava (again)