NXP-10805: upgrade shindig to use guava