NXP-10805, NXP-10906: upgrade shindig to use guava, get rid of google-collections